[dev.link] cmd/link: remove Sub field from sym.Symbol

Remove 'Sub' field from sym.Symbol, replacing uses (those downstream of
loadlibfull) with loader method calls.

NB: removing the Outer field will have to wait for now; it is accessed
in archreloc methods that don't have access to link ctxt or loader
currently.

Change-Id: I2abe5906fc169c64b2ab7d5ad213619bea5a17c7
Reviewed-on: https://go-review.googlesource.com/c/go/+/230617
Run-TryBot: Than McIntosh <thanm@google.com>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Jeremy Faller <jeremy@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>

diff --git a/src/cmd/link/internal/ld/elf.go b/src/cmd/link/internal/ld/elf.go
index 3be3f991711ca376523ec8317d4677cf907f4574..83f100c12ba5be592e21862573effe02eb7f4552 100644 (file)
--- a/src/cmd/link/internal/ld/elf.go
+++ b/src/cmd/link/internal/ld/elf.go
@@ -2026,7 +2026,7 @@ func Asmbelf(ctxt *Link, symo int64) {
                // sh.info is the index of first non-local symbol (number of local symbols)
                s := ctxt.Syms.Lookup(".dynsym", 0)
                i := uint32(0)
-               for sub := s; sub != nil; sub = sub.Sub {
+               for sub := s; sub != nil; sub = symSub(ctxt, sub) {
                        i++
                        if !sub.Attr.Local() {
                                break

diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go
index 51d81eb28dc59e399fc3c07f81419f83ca64603e..baccb8baaeaab3ed4eb36e9ba9ccae248a5af578 100644 (file)
--- a/src/cmd/link/internal/ld/lib.go
+++ b/src/cmd/link/internal/ld/lib.go
@@ -2929,12 +2929,19 @@ func ElfSymForReloc(ctxt *Link, s *sym.Symbol) int32 {
        }
 }
 
+func symSub(ctxt *Link, s *sym.Symbol) *sym.Symbol {
+       if lsub := ctxt.loader.SubSym(loader.Sym(s.SymIdx)); lsub != 0 {
+               return ctxt.loader.Syms[lsub]
+       }
+       return nil
+}
+
 func (ctxt *Link) dumpsyms() {
        for _, s := range ctxt.loader.Syms {
                if s == nil {
                        continue
                }
-               fmt.Printf("%s %s reachable=%v onlist=%v outer=%v sub=%v\n", s, s.Type, s.Attr.Reachable(), s.Attr.OnList(), s.Outer, s.Sub)
+               fmt.Printf("%s %s reachable=%v onlist=%v outer=%v sub=%v\n", s, s.Type, s.Attr.Reachable(), s.Attr.OnList(), s.Outer, symSub(ctxt, s))
                for i := range s.R {
                        fmt.Println("\t", s.R[i].Type, s.R[i].Sym)
                }

diff --git a/src/cmd/link/internal/loader/loader.go b/src/cmd/link/internal/loader/loader.go
index 2abd0e60e161c7a9defdf49cb5c55b4bded4cc95..4fcdc1a661feddf8c33cf90b07d2c54181dbb89a 100644 (file)
--- a/src/cmd/link/internal/loader/loader.go
+++ b/src/cmd/link/internal/loader/loader.go
@@ -2544,13 +2544,10 @@ func (l *Loader) migrateAttributes(src Sym, dst *sym.Symbol) {
        dst.Attr.Set(sym.AttrCgoExportStatic, l.AttrCgoExportStatic(src))
        dst.Attr.Set(sym.AttrReadOnly, l.AttrReadOnly(src))
 
-       // Convert outer/sub relationships
+       // Convert outer relationship
        if outer, ok := l.outer[src]; ok {
                dst.Outer = l.Syms[outer]
        }
-       if sub, ok := l.sub[src]; ok {
-               dst.Sub = l.Syms[sub]
-       }
 
        // Set sub-symbol attribute. See the comment on the AttrSubSymbol
        // method for more on this, there is some tricky stuff here.

diff --git a/src/cmd/link/internal/sym/sizeof_test.go b/src/cmd/link/internal/sym/sizeof_test.go
index 4cfca3b5a33bb48984f48cfe8651ff1b5260fa0c..f358ccee66becdabe7c4538aa54db5ad8611e915 100644 (file)
--- a/src/cmd/link/internal/sym/sizeof_test.go
+++ b/src/cmd/link/internal/sym/sizeof_test.go
@@ -21,7 +21,7 @@ func TestSizeof(t *testing.T) {
                _32bit uintptr     // size on 32bit platforms
                _64bit uintptr     // size on 64bit platforms
        }{
-               {Symbol{}, 84, 136},
+               {Symbol{}, 80, 128},
        }
 
        for _, tt := range tests {

diff --git a/src/cmd/link/internal/sym/symbol.go b/src/cmd/link/internal/sym/symbol.go
index 546798fdf492e78375cf835de6e4034a8fccc4c4..3c3717ff318980e35a068c7dfe851e44c335544b 100644 (file)
--- a/src/cmd/link/internal/sym/symbol.go
+++ b/src/cmd/link/internal/sym/symbol.go
@@ -23,7 +23,6 @@ type Symbol struct {
        Align   int32
        Value   int64
        Size    int64
-       Sub     *Symbol
        Outer   *Symbol
        SymIdx  LoaderSym
        auxinfo *AuxSymbol