go/types: unsafe.Pointer is not an alias

Change-Id: Ieb0808caa24c9a5e599084183ba5ee8a6536f7d8
Reviewed-on: https://go-review.googlesource.com/36622
Reviewed-by: Robert Griesemer <gri@golang.org>

diff --git a/src/go/types/object.go b/src/go/types/object.go
index 3c44348696600191e46d0d7e22919dd4ca99f0f1..6d05052c7171546dd3e3da2924cddae287e73d31 100644 (file)
--- a/src/go/types/object.go
+++ b/src/go/types/object.go
@@ -164,6 +164,10 @@ func (obj *TypeName) IsAlias() bool {
        case nil:
                return false
        case *Basic:
+               // unsafe.Pointer is not an alias.
+               if obj.pkg == Unsafe {
+                       return false
+               }
                // Any user-defined type name for a basic type is an alias for a
                // basic type (because basic types are pre-declared in the Universe
                // scope, outside any package scope), and so is any type name with

diff --git a/src/go/types/object_test.go b/src/go/types/object_test.go
index 16d7d5c7236237aabdfa190a0f053f17cbca779c..b0acdd91bac26b87f867de9aa834923338b39263 100644 (file)
--- a/src/go/types/object_test.go
+++ b/src/go/types/object_test.go
@@ -14,6 +14,7 @@ func TestIsAlias(t *testing.T) {
        }
 
        // predeclared types
+       check(Unsafe.Scope().Lookup("Pointer").(*TypeName), false)
        for _, name := range Universe.Names() {
                if obj, _ := Universe.Lookup(name).(*TypeName); obj != nil {
                        check(obj, name == "byte" || name == "rune")