go/types: set up correct type with NewAlias

Change-Id: I4b035b3539c98e5b1442d1009d457cbc199b42ee
Reviewed-on: https://go-review.googlesource.com/32637
Reviewed-by: Matthew Dempsky <mdempsky@google.com>

diff --git a/src/go/types/object.go b/src/go/types/object.go
index ede78537bedbf9ddb8fe3f8f0199753f1f50334a..4ebbd23543bb88d722e32f261f82d17f8809171e 100644 (file)
--- a/src/go/types/object.go
+++ b/src/go/types/object.go
@@ -219,11 +219,18 @@ func (*Func) isDependency()     {} // a function may be a dependency of an initi
 type Alias struct {
        object
        orig Object      // aliased constant, type, variable, or function; never an alias
-       kind token.Token // token.CONST, token.TYPE, token.VAR, or token.FUNC (type-checking internal use only)
+       kind token.Token // token.CONST, token.TYPE, token.VAR, or token.FUNC (only needed during resolve phase)
 }
 
 func NewAlias(pos token.Pos, pkg *Package, name string, orig Object) *Alias {
-       return &Alias{object{pos: pos, pkg: pkg, name: name}, orig, token.ILLEGAL}
+       var typ Type = Typ[Invalid]
+       if orig != nil {
+               typ = orig.Type()
+       }
+       // No need to set a valid Alias.kind - that field is only used during identifier
+       // resolution (1st type-checker pass). We could store the field outside but it's
+       // easier to keep it here.
+       return &Alias{object{nil, pos, pkg, name, typ, 0, token.NoPos}, orig, token.ILLEGAL}
 }
 
 // Orig returns the aliased object, or nil if there was an error.

diff --git a/src/go/types/resolver.go b/src/go/types/resolver.go
index 12ef4ad779db54b147f5a007970cbd171c3319de..b630a159e067be51a8baca396ec062d25296f549 100644 (file)
--- a/src/go/types/resolver.go
+++ b/src/go/types/resolver.go
@@ -276,6 +276,7 @@ func (check *Checker) collectObjects() {
 
                                        case *ast.AliasSpec:
                                                obj := NewAlias(s.Name.Pos(), pkg, s.Name.Name, nil)
+                                               obj.typ = nil // unresolved
                                                obj.kind = d.Tok
                                                check.declarePkgObj(s.Name, obj, &declInfo{file: fileScope, init: s.Orig})