diff options
| author | Matthew Dempsky <mdempsky@google.com> | 2022-05-12 15:45:13 -0700 |
|---|---|---|
| committer | Matthew Dempsky <mdempsky@google.com> | 2022-05-13 21:12:13 +0000 |
| commit | 1973be519aaab9bd21d9255b0926d960d2ea2666 (patch) | |
| tree | 4bb63cbd29359dfb9a6ba222adff633b9e605ca4 /src/cmd/compile | |
| parent | b6c5a5baa7c2c4df7ec8016e9a766dcc57895582 (diff) | |
| download | go-1973be519aaab9bd21d9255b0926d960d2ea2666.tar.xz | |
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>
Diffstat (limited to 'src/cmd/compile')
| -rw-r--r-- | src/cmd/compile/internal/noder/linker.go | 2 | ||||
| -rw-r--r-- | src/cmd/compile/internal/noder/reader.go | 4 | ||||
| -rw-r--r-- | src/cmd/compile/internal/noder/unified.go | 2 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/cmd/compile/internal/noder/linker.go b/src/cmd/compile/internal/noder/linker.go index 0c86088e62..4ad05dcbe0 100644 --- 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 2c038b0689..61a00fb04b 100644 --- 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 e7a4001cec..91a3f3fb4b 100644 --- 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") |