diff options
| author | Matthew Dempsky <mdempsky@google.com> | 2018-06-21 16:12:17 -0700 |
|---|---|---|
| committer | Matthew Dempsky <mdempsky@google.com> | 2018-06-22 17:57:09 +0000 |
| commit | f422bea498b138022135060050bbbc249589a945 (patch) | |
| tree | e481dc22c1a098f22c76642054bb18f800bbca40 /src/cmd/compile/internal/gc/export.go | |
| parent | 78a579316b84f68eaf8ee401e77fdb85bb13483f (diff) | |
| download | go-f422bea498b138022135060050bbbc249589a945.tar.gz go-f422bea498b138022135060050bbbc249589a945.zip | |
cmd/compile: fix compile failure for lazily resolved shadowed types
If expanding an inline function body required lazily expanding a
package-scoped type whose identifier was shadowed within the function
body, the lazy expansion would instead overwrite the local symbol
definition instead of the package-scoped symbol. This was due to
importsym using s.Def instead of s.PkgDef.
Unfortunately, this is yet another consequence of the current awkward
scope handling code.
Passes toolstash-check.
Fixes #25984.
Change-Id: Ia7033e1749a883e6e979c854d4b12b0b28083dd8
Reviewed-on: https://go-review.googlesource.com/120456
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Chase <drchase@google.com>
Reviewed-by: Robert Griesemer <gri@golang.org>
Diffstat (limited to 'src/cmd/compile/internal/gc/export.go')
| -rw-r--r-- | src/cmd/compile/internal/gc/export.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/cmd/compile/internal/gc/export.go b/src/cmd/compile/internal/gc/export.go index cd71db3a14..becc4e1f3b 100644 --- a/src/cmd/compile/internal/gc/export.go +++ b/src/cmd/compile/internal/gc/export.go @@ -89,7 +89,7 @@ func dumpexport(bout *bio.Writer) { } func importsym(ipkg *types.Pkg, pos src.XPos, s *types.Sym, op Op) *Node { - n := asNode(s.Def) + n := asNode(s.PkgDef()) if n == nil { // iimport should have created a stub ONONAME // declaration for all imported symbols. The exception @@ -100,7 +100,7 @@ func importsym(ipkg *types.Pkg, pos src.XPos, s *types.Sym, op Op) *Node { } n = dclname(s) - s.Def = asTypesNode(n) + s.SetPkgDef(asTypesNode(n)) s.Importdef = ipkg } if n.Op != ONONAME && n.Op != op { |