cmd/link, internal/abi: minor follow-up cleanups

these address comments on CLs in the large refactoring stack
recently submitted.

Change-Id: Ic9023c32aafe4dda953b42c9a36834d3ab3432eb
Reviewed-on: https://go-review.googlesource.com/c/go/+/495835
Reviewed-by: Than McIntosh <thanm@google.com>
TryBot-Result: Gopher Robot <gobot@golang.org>
Run-TryBot: David Chase <drchase@google.com>
Reviewed-by: Cherry Mui <cherryyz@google.com>

diff --git a/src/cmd/link/internal/ld/decodesym.go b/src/cmd/link/internal/ld/decodesym.go
index 7fccc7d980400be5419fe251fc8108309b967861..c01d6c1163bfbd5bad09a05f24830ef4ce848601 100644 (file)
--- a/src/cmd/link/internal/ld/decodesym.go
+++ b/src/cmd/link/internal/ld/decodesym.go
@@ -59,7 +59,7 @@ func decodetypePtrdata(arch *sys.Arch, p []byte) int64 {
 
 // Type.commonType.tflag
 func decodetypeHasUncommon(arch *sys.Arch, p []byte) bool {
-       return abi.TFlag(p[2*arch.PtrSize+4])&abi.TFlagUncommon != 0
+       return abi.TFlag(p[abi.TFlagOff(arch.PtrSize)])&abi.TFlagUncommon != 0
 }
 
 // Type.FuncType.dotdotdot
@@ -222,7 +222,7 @@ func decodetypeStr(ldr *loader.Loader, arch *sys.Arch, symIdx loader.Sym) string
        relocs := ldr.Relocs(symIdx)
        str := decodetypeName(ldr, symIdx, &relocs, 4*arch.PtrSize+8)
        data := ldr.Data(symIdx)
-       if data[2*arch.PtrSize+4]&byte(abi.TFlagExtraStar) != 0 {
+       if data[abi.TFlagOff(arch.PtrSize)]&byte(abi.TFlagExtraStar) != 0 {
                return str[1:]
        }
        return str

diff --git a/src/internal/abi/type.go b/src/internal/abi/type.go
index ce950c3937812859e2cb40c87ce6eac92d538b62..4794f5a51eb67d89d9dfa823396e8fe00c9d5813 100644 (file)
--- a/src/internal/abi/type.go
+++ b/src/internal/abi/type.go
@@ -675,10 +675,10 @@ func (n Name) Tag() string {
 
 func NewName(n, tag string, exported, embedded bool) Name {
        if len(n) >= 1<<29 {
-               panic("reflect.nameFrom: name too long: " + n[:1024] + "...")
+               panic("abi.NewName: name too long: " + n[:1024] + "...")
        }
        if len(tag) >= 1<<29 {
-               panic("reflect.nameFrom: tag too long: " + tag[:1024] + "...")
+               panic("abi.NewName: tag too long: " + tag[:1024] + "...")
        }
        var nameLen [10]byte
        var tagLen [10]byte