From 49099d21f5f130b2c42eb4dfdf4ebeb8464c174c Mon Sep 17 00:00:00 2001 From: Than McIntosh Date: Wed, 18 Mar 2020 14:32:17 -0400 Subject: [PATCH] [dev.link] cmd/link: add loader.Loader apis for symbol dynamic id Add SymDynid and SetSymDynid methods to the loader. This symbol property is currently backed by a map. Change-Id: Iaf86b1d8aaa775fa102fadea30394eb8a670e0e2 Reviewed-on: https://go-review.googlesource.com/c/go/+/224378 Run-TryBot: Than McIntosh TryBot-Result: Gobot Gobot Reviewed-by: Jeremy Faller Reviewed-by: Cherry Zhang --- src/cmd/link/internal/loader/loader.go | 25 ++++++++++++++++++++++++- 1 file changed, 24 insertions(+), 1 deletion(-) diff --git a/src/cmd/link/internal/loader/loader.go b/src/cmd/link/internal/loader/loader.go index a916c50f19..13c4e5843c 100644 --- a/src/cmd/link/internal/loader/loader.go +++ b/src/cmd/link/internal/loader/loader.go @@ -240,6 +240,7 @@ type Loader struct { symFile map[Sym]string // stores file for shlib-derived syms plt map[Sym]int32 // stores dynimport for pe objects got map[Sym]int32 // stores got for pe objects + dynid map[Sym]int32 // stores Dynid for symbol // Used to implement field tracking; created during deadcode if // field tracking is enabled. Reachparent[K] contains the index of @@ -302,6 +303,7 @@ func NewLoader(flags uint32, elfsetstring elfsetstringFunc) *Loader { symFile: make(map[Sym]string), plt: make(map[Sym]int32), got: make(map[Sym]int32), + dynid: make(map[Sym]int32), attrTopFrame: make(map[Sym]struct{}), attrSpecial: make(map[Sym]struct{}), attrCgoExportDynamic: make(map[Sym]struct{}), @@ -1127,7 +1129,7 @@ func (l *Loader) SetPlt(i Sym, v int32) { // SetGot sets the got value for pe symbols. func (l *Loader) SetGot(i Sym, v int32) { if i >= Sym(len(l.objSyms)) || i == 0 { - panic("bad symbol for SetPlt") + panic("bad symbol for SetGot") } if v == 0 { delete(l.got, i) @@ -1136,6 +1138,27 @@ func (l *Loader) SetGot(i Sym, v int32) { } } +// SymDynid returns the "dynid" property for the specified symbol. +func (l *Loader) SymDynid(i Sym) int32 { + if s, ok := l.dynid[i]; ok { + return s + } + return -1 +} + +// SetSymDynid sets the "dynid" property for a symbol. +func (l *Loader) SetSymDynid(i Sym, val int32) { + // reject bad symbols + if i >= Sym(len(l.objSyms)) || i == 0 { + panic("bad symbol index in SetSymDynid") + } + if val == -1 { + delete(l.dynid, i) + } else { + l.dynid[i] = val + } +} + // SymGoType returns the 'Gotype' property for a given symbol (set by // the Go compiler for variable symbols). This version relies on // reading aux symbols for the target sym -- it could be that a faster -- 2.48.1