From a6e3cc80e87d58d7fdb23da870845b456969b929 Mon Sep 17 00:00:00 2001 From: Alan Donovan Date: Thu, 4 Feb 2016 11:29:55 -0500 Subject: [PATCH] oracle: describe: backport fix to 1.4, 1.5 (See CL 19158, bug 14160, commit 35b3d64) Change-Id: I01ee2bb0eca072141b2c4551789793b1d5c480e3 Reviewed-on: https://go-review.googlesource.com/19189 Reviewed-by: Michael Matloob --- oracle/describe14.go | 6 ++++++ oracle/describe15.go | 6 ++++++ 2 files changed, 12 insertions(+) diff --git a/oracle/describe14.go b/oracle/describe14.go index e7784185..c8ccc2d8 100644 --- a/oracle/describe14.go +++ b/oracle/describe14.go @@ -680,6 +680,12 @@ func tokenOf(o types.Object) string { return "const" case *types.PkgName: return "package" + case *types.Builtin: + return "builtin" // e.g. when describing package "unsafe" + case *types.Nil: + return "nil" + case *types.Label: + return "label" } panic(o) } diff --git a/oracle/describe15.go b/oracle/describe15.go index 6f812e6c..1276f9a1 100644 --- a/oracle/describe15.go +++ b/oracle/describe15.go @@ -680,6 +680,12 @@ func tokenOf(o types.Object) string { return "const" case *types.PkgName: return "package" + case *types.Builtin: + return "builtin" // e.g. when describing package "unsafe" + case *types.Nil: + return "nil" + case *types.Label: + return "label" } panic(o) }