cmd/compile/internal/noder: remove unified IR assumptions on LocalPkg.Path == ""

Replace `pkg.Path == ""` check with `pkg == types.LocalPkg`. This is a
prep refactoring for CL 393715, which will properly initialize
types.LocalPkg.

Updates #51734.

Change-Id: I7a5428ef1f422de396762b6bc6d323992834b27c
Reviewed-on: https://go-review.googlesource.com/c/go/+/406056
Reviewed-by: David Chase <drchase@google.com>
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>

diff --git a/src/cmd/compile/internal/noder/linker.go b/src/cmd/compile/internal/noder/linker.go
index 0c86088e627b342a692891f44996be7f14f14661..4ad05dcbe0e2cc1b50a3061f52a26163b0dc0e86 100644 (file)
--- a/src/cmd/compile/internal/noder/linker.go
+++ b/src/cmd/compile/internal/noder/linker.go
@@ -153,7 +153,7 @@ func (l *linker) relocObj(pr *pkgReader, idx int) int {
        l.relocCommon(pr, &wdict, pkgbits.RelocObjDict, idx)
 
        var obj *ir.Name
-       if path == "" {
+       if sym.Pkg == types.LocalPkg {
                var ok bool
                obj, ok = sym.Def.(*ir.Name)
 

diff --git a/src/cmd/compile/internal/noder/reader.go b/src/cmd/compile/internal/noder/reader.go
index 2c038b0689570aa4f4ba52cbb28fc4ebcccb5a79..61a00fb04bf64b17b1cade1c772ae969c1ab3381 100644 (file)
--- a/src/cmd/compile/internal/noder/reader.go
+++ b/src/cmd/compile/internal/noder/reader.go
@@ -295,13 +295,13 @@ func (r *reader) doPkg() *types.Pkg {
        if pkg.Name == "" {
                pkg.Name = name
        } else {
-               assert(pkg.Name == name)
+               base.Assertf(pkg.Name == name, "package %q has name %q, but want %q", pkg.Path, pkg.Name, name)
        }
 
        if pkg.Height == 0 {
                pkg.Height = height
        } else {
-               assert(pkg.Height == height)
+               base.Assertf(pkg.Height == height, "package %q has height %v, but want %v", pkg.Path, pkg.Height, height)
        }
 
        return pkg

diff --git a/src/cmd/compile/internal/noder/unified.go b/src/cmd/compile/internal/noder/unified.go
index e7a4001cec2ab389f1bb15d893c88463217e14e9..91a3f3fb4bc2a312642ed47740c5a5075559b474 100644 (file)
--- a/src/cmd/compile/internal/noder/unified.go
+++ b/src/cmd/compile/internal/noder/unified.go
@@ -232,7 +232,7 @@ func readPackage(pr *pkgReader, importpkg *types.Pkg) {
        r := pr.newReader(pkgbits.RelocMeta, pkgbits.PublicRootIdx, pkgbits.SyncPublic)
 
        pkg := r.pkg()
-       assert(pkg == importpkg)
+       base.Assertf(pkg == importpkg, "have package %q (%p), want package %q (%p)", pkg.Path, pkg, importpkg.Path, importpkg)
 
        if r.Bool() {
                sym := pkg.Lookup(".inittask")