Stowage/go
2
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-12-08 06:10:04 +00:00
Code Issues Projects Releases Packages Wiki Activity

[dev.link] cmd/link: move setupdynexp before loadlibfull

Browse source 
Rewrite setupdynexp to work with loader.Sym, and move the call to it
before the body of loadlibfull. After loadlibfull is complete,
construct the old *sym.Symbol version of dynexp, since not all all
clients that access this list are converted to the loader APIs.

Change-Id: I347d24958e2f3e2332fbe33f2eb6ec25cc126bdb
Reviewed-on: https://go-review.googlesource.com/c/go/+/224382
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Jeremy Faller <jeremy@golang.org>
Run-TryBot: Than McIntosh <thanm@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
This commit is contained in:
Than McIntosh 2020-03-20 08:31:38 -04:00
parent 3fa98a0436
commit e14efb6865
4 changed files with 87 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

42
src/cmd/link/internal/ld/lib.go
View file

@ -572,31 +572,47 @@ func (ctxt *Link) loadlib() {
strictDupMsgCount = ctxt.loader.NStrictDupMsgs()
}
// Set up dynexp list.
// genSymsForDynexp constructs a *sym.Symbol version of ctxt.dynexp,
// writing to the global variable 'dynexp'.
func genSymsForDynexp(ctxt *Link) {
dynexp = make([]*sym.Symbol, len(ctxt.dynexp2))
for i, s := range ctxt.dynexp2 {
dynexp[i] = ctxt.loader.Syms[s]
}
}
// setupdynexp constructs ctxt.dynexp, a list of loader.Sym.
func setupdynexp(ctxt *Link) {
dynexpMap := ctxt.cgo_export_dynamic
if ctxt.LinkMode == LinkExternal {
dynexpMap = ctxt.cgo_export_static
}
dynexp = make([]*sym.Symbol, 0, len(dynexpMap))
d := make([]loader.Sym, 0, len(dynexpMap))
for exp := range dynexpMap {
s := ctxt.Syms.Lookup(exp, 0)
dynexp = append(dynexp, s)
s := ctxt.loader.LookupOrCreateSym(exp, 0)
d = append(d, s)
// sanity check
if !ctxt.loader.AttrReachable(s) {
panic("dynexp entry not reachable")
}
}
sort.Sort(byName(dynexp))
sort.Slice(dynexp, func(i, j int) bool {
return ctxt.loader.SymName(d[i]) < ctxt.loader.SymName(d[j])
})
// Resolve ABI aliases in the list of cgo-exported functions.
// This is necessary because we load the ABI0 symbol for all
// cgo exports.
for i, s := range dynexp {
if s.Type != sym.SABIALIAS {
for i, s := range d {
if ctxt.loader.SymType(s) != sym.SABIALIAS {
continue
}
t := resolveABIAlias(s)
t.Attr |= s.Attr
t.SetExtname(s.Extname())
dynexp[i] = t
t := ctxt.loader.ResolveABIAlias(s)
ctxt.loader.CopyAttributes(s, t)
ctxt.loader.SetSymExtname(t, ctxt.loader.SymExtname(s))
d[i] = t
}
ctxt.dynexp2 = d
ctxt.cgo_export_static = nil
ctxt.cgo_export_dynamic = nil
@ -2711,6 +2727,7 @@ func dfs(lib *sym.Library, mark map[*sym.Library]markKind, order *[]*sym.Library
}
func (ctxt *Link) loadlibfull() {
// Load full symbol contents, resolve indexed references.
ctxt.loader.LoadFull(ctxt.Arch, ctxt.Syms)
@ -2724,7 +2741,8 @@ func (ctxt *Link) loadlibfull() {
ctxt.loader.ExtractSymbols(ctxt.Syms, ctxt.Reachparent)
ctxt.lookup = ctxt.Syms.ROLookup
setupdynexp(ctxt)
// Recreate dynexp using *sym.Symbol instead of loader.Sym
genSymsForDynexp(ctxt)
// Drop the cgodata reference.
ctxt.cgodata = nil