From 9e44c1c403071e0c2831952513e7b948587d94af Mon Sep 17 00:00:00 2001 From: Than McIntosh Date: Wed, 24 Apr 2019 15:47:23 -0400 Subject: [PATCH] go/internal/gccgoimporter: update package to match std lib version Import changes from std lib version, specifically https://golang.org/cl/173440 which rolls out a more robust fix for issue 31540. Updates golang/go#31540. Change-Id: Ibeeb00ffd0ee6456d50fd4a243a1162f3940ad68 Reviewed-on: https://go-review.googlesource.com/c/tools/+/173777 Run-TryBot: Than McIntosh Reviewed-by: Ian Lance Taylor --- go/internal/gccgoimporter/parser.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/go/internal/gccgoimporter/parser.go b/go/internal/gccgoimporter/parser.go index ca63b342..6221084f 100644 --- a/go/internal/gccgoimporter/parser.go +++ b/go/internal/gccgoimporter/parser.go @@ -497,6 +497,7 @@ func (p *parser) parseNamedType(nlist []int) types.Type { // type alias if p.tok == '=' { p.next() + p.aliases[nlist[len(nlist)-1]] = name if obj != nil { // use the previously imported (canonical) type t := obj.Type() @@ -506,7 +507,6 @@ func (p *parser) parseNamedType(nlist []int) types.Type { } t := p.parseType(pkg, nlist...) obj = types.NewTypeName(token.NoPos, pkg, name, t) - p.aliases[nlist[len(nlist)-1]] = name scope.Insert(obj) return t }