From dfdf55158dcfc3ef1bd436b3b9ed6daa20801fdb Mon Sep 17 00:00:00 2001 From: Matthew Dempsky Date: Tue, 6 Sep 2022 19:30:30 -0700 Subject: [PATCH] cmd/compile/internal/noder: fix type switch case vars package When naming case variables, the unified frontend was using typecheck.Lookup, which uses the current package, rather than localIdent, which uses the package the variable was originally declared in. When inlining across package boundaries, this could cause the case variables to be associated with the wrong package. In practice, I don't believe this has any negative consequences, but it's inconsistent and triggered an ICE in typecheck.ClosureType, which expected all captured variables to be declared in the same package. Easy fix is to ensure case variables are declared in the correct package by using localIdent. Fixes #54912. Change-Id: I7a429c708ad95723f46a67872cb0cf0c53a6a0d6 Reviewed-on: https://go-review.googlesource.com/c/go/+/428918 Run-TryBot: Matthew Dempsky TryBot-Result: Gopher Robot Reviewed-by: Cuong Manh Le Reviewed-by: Benny Siegert --- src/cmd/compile/internal/noder/reader.go | 2 +- src/cmd/compile/internal/noder/writer.go | 4 ++++ src/cmd/compile/internal/typecheck/func.go | 2 +- test/run.go | 2 -- 4 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/cmd/compile/internal/noder/reader.go b/src/cmd/compile/internal/noder/reader.go index fb9df3284fa..b8df7c97734 100644 --- a/src/cmd/compile/internal/noder/reader.go +++ b/src/cmd/compile/internal/noder/reader.go @@ -1957,7 +1957,7 @@ func (r *reader) switchStmt(label *types.Sym) ir.Node { pos := r.pos() if r.Bool() { pos := r.pos() - sym := typecheck.Lookup(r.String()) + _, sym := r.localIdent() ident = ir.NewIdent(pos, sym) } x := r.expr() diff --git a/src/cmd/compile/internal/noder/writer.go b/src/cmd/compile/internal/noder/writer.go index 0b1d41d7501..198bae71903 100644 --- a/src/cmd/compile/internal/noder/writer.go +++ b/src/cmd/compile/internal/noder/writer.go @@ -1484,6 +1484,10 @@ func (w *writer) switchStmt(stmt *syntax.SwitchStmt) { w.pos(guard) if tag := guard.Lhs; w.Bool(tag != nil) { w.pos(tag) + + // Like w.localIdent, but we don't have a types2.Object. + w.Sync(pkgbits.SyncLocalIdent) + w.pkg(w.p.curpkg) w.String(tag.Value) } w.expr(guard.X) diff --git a/src/cmd/compile/internal/typecheck/func.go b/src/cmd/compile/internal/typecheck/func.go index d62066f33ce..7cf9d5cb404 100644 --- a/src/cmd/compile/internal/typecheck/func.go +++ b/src/cmd/compile/internal/typecheck/func.go @@ -105,7 +105,7 @@ func ClosureType(clo *ir.ClosureExpr) *types.Type { if pkg == nil { pkg = v.Sym().Pkg } else if pkg != v.Sym().Pkg { - base.Fatalf("Closure variables from multiple packages") + base.Fatalf("Closure variables from multiple packages: %+v", clo) } } } diff --git a/test/run.go b/test/run.go index ecb08ce8349..3c5b10ad32c 100644 --- a/test/run.go +++ b/test/run.go @@ -2021,8 +2021,6 @@ var unifiedFailures = setOf( "closure3.go", // unified IR numbers closures differently than -d=inlfuncswithclosures "escape4.go", // unified IR can inline f5 and f6; test doesn't expect this - "fixedbugs/issue54912.go", // ICE when inlined type switch case variable captured in function literal - "typeparam/issue47631.go", // unified IR can handle local type declarations )