cybercyst/go
1
0
Fork 0
mirror of https://github.com/golang/go.git synced 2025-05-15 12:24:37 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[dev.link] cmd/link: clean up unused function and arguments

Browse Source 
Change-Id: Idacb027c5ae11e029ee4ab10f6c9a76ff435e5b7
Reviewed-on: https://go-review.googlesource.com/c/go/+/219228
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Jeremy Faller <jeremy@golang.org>
This commit is contained in:
Cherry Zhang 2020-02-12 17:50:21 -05:00
parent b0275bfbf4
commit 5a8b1509dd
2 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/cmd/link/internal/ld/lib.go
View File

@ -446,7 +446,7 @@ func (ctxt *Link) loadlib() {
} }
// Add non-package symbols and references of externally defined symbols. // Add non-package symbols and references of externally defined symbols.
ctxt.loader.LoadNonpkgSyms(ctxt.Arch, ctxt.Syms) ctxt.loader.LoadNonpkgSyms(ctxt.Syms)
// Load symbols from shared libraries, after all Go object symbols are loaded. // Load symbols from shared libraries, after all Go object symbols are loaded.
for _, lib := range ctxt.Library { for _, lib := range ctxt.Library {
@ -1815,7 +1815,7 @@ func ldobj(ctxt *Link, f *bio.Reader, lib *sym.Library, length int64, pn string,
ldpkg(ctxt, f, lib, import1-import0-2, pn) // -2 for !\n ldpkg(ctxt, f, lib, import1-import0-2, pn) // -2 for !\n
f.MustSeek(import1, 0) f.MustSeek(import1, 0)
ctxt.loader.Preload(ctxt.Arch, ctxt.Syms, f, lib, unit, eof-f.Offset(), pn, 0) ctxt.loader.Preload(ctxt.Syms, f, lib, unit, eof-f.Offset(), 0)
addImports(ctxt, lib, pn) addImports(ctxt, lib, pn)
return nil return nil
} }

16
src/cmd/link/internal/loader/loader.go
View File

@ -1476,7 +1476,7 @@ func (x RelocByOff) Less(i, j int) bool { return x[i].Off < x[j].Off }
// Preload a package: add autolibs, add defined package symbols to the symbol table. // Preload a package: add autolibs, add defined package symbols to the symbol table.
// Does not add non-package symbols yet, which will be done in LoadNonpkgSyms. // Does not add non-package symbols yet, which will be done in LoadNonpkgSyms.
// Does not read symbol data. // Does not read symbol data.
func (l *Loader) Preload(arch *sys.Arch, syms *sym.Symbols, f *bio.Reader, lib *sym.Library, unit *sym.CompilationUnit, length int64, pn string, flags int) { func (l *Loader) Preload(syms *sym.Symbols, f *bio.Reader, lib *sym.Library, unit *sym.CompilationUnit, length int64, flags int) {
roObject, readonly, err := f.Slice(uint64(length)) roObject, readonly, err := f.Slice(uint64(length))
if err != nil { if err != nil {
log.Fatal("cannot read object file:", err) log.Fatal("cannot read object file:", err)
@ -1554,16 +1554,16 @@ func (l *Loader) preloadSyms(r *oReader, kind int) {
// Add non-package symbols and references to external symbols (which are always // Add non-package symbols and references to external symbols (which are always
// named). // named).
func (l *Loader) LoadNonpkgSyms(arch *sys.Arch, syms *sym.Symbols) { func (l *Loader) LoadNonpkgSyms(syms *sym.Symbols) {
for _, o := range l.objs[1:] { for _, o := range l.objs[1:] {
l.preloadSyms(o.r, nonPkgDef) l.preloadSyms(o.r, nonPkgDef)
} }
for _, o := range l.objs[1:] { for _, o := range l.objs[1:] {
loadObjRefs(l, o.r, arch, syms) loadObjRefs(l, o.r, syms)
} }
} }
func loadObjRefs(l *Loader, r *oReader, arch *sys.Arch, syms *sym.Symbols) { func loadObjRefs(l *Loader, r *oReader, syms *sym.Symbols) {
ndef := r.NSym() + r.NNonpkgdef() ndef := r.NSym() + r.NNonpkgdef()
for i, n := 0, r.NNonpkgref(); i < n; i++ { for i, n := 0, r.NNonpkgref(); i < n; i++ {
osym := goobj2.Sym{} osym := goobj2.Sym{}
@ -1834,14 +1834,6 @@ type funcAllocInfo struct {
fdOff uint32 // number of int64's needed in all Funcdataoff slices fdOff uint32 // number of int64's needed in all Funcdataoff slices
} }
// LookupOrCreate looks up a symbol by name, and creates one if not found.
// Either way, it will also create a sym.Symbol for it, if not already.
// This should only be called when interacting with parts of the linker
// that still works on sym.Symbols (i.e. internal cgo linking, for now).
func (l *Loader) LookupOrCreate(name string, version int) *sym.Symbol {
panic("unreachable") // TODO: delete once PE loader is converted
}
// cloneToExternal takes the existing object file symbol (symIdx) // cloneToExternal takes the existing object file symbol (symIdx)
// and creates a new external symbol payload that is a clone with // and creates a new external symbol payload that is a clone with
// respect to name, version, type, relocations, etc. The idea here // respect to name, version, type, relocations, etc. The idea here