qbit/go
1
0
Fork 0
mirror of https://github.com/golang/go synced 2024-11-23 23:50:08 -07:00
Code Releases Activity

cmd/link: various cleanups using tools

Browse Source 
* remove unnecessary explicit types
* remove dead assignments
* remove unused fields
* unindent code using early continues
* remove some unnecessary type conversions
* remove some unused func parameters

Change-Id: I202c67e92940beacbd80fc2dc179f9556dc5d9e5
Reviewed-on: https://go-review.googlesource.com/69118
Run-TryBot: Daniel Martí <mvdan@mvdan.cc>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: David Crawshaw <crawshaw@golang.org>
This commit is contained in:
Daniel Martí 2017-10-09 10:11:00 +01:00
parent 7830a19a4f
commit 966c459fa4
8 changed files with 33 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/cmd/link/internal/ld/dwarf.go
View File

@ -266,7 +266,7 @@ func reverselist(list **dwarf.DWDie) {
curr := *list
var prev *dwarf.DWDie
for curr != nil {
var next *dwarf.DWDie = curr.Link
next := curr.Link
curr.Link = prev
prev = curr
curr = next
@ -1077,7 +1077,6 @@ func writelines(ctxt *Link, syms []*sym.Symbol) ([]*sym.Symbol, []*sym.Symbol) {
continue
}
epc = s.Value + s.Size
epcs = s
dsym := ctxt.Syms.Lookup(dwarf.InfoPrefix+s.Name, int(s.Version))

8
src/cmd/link/internal/ld/elf.go
View File

@ -810,7 +810,6 @@ type ElfShdr struct {
addralign uint64
entsize uint64
shnum int
secsym *sym.Symbol
}
/*
@ -888,7 +887,7 @@ const (
var (
Iself bool
Nelfsym int = 1
Nelfsym = 1
elf64 bool
// Either ".rel" or ".rela" depending on which type of relocation the
@ -1611,7 +1610,9 @@ func elfphrelro(seg *sym.Segment) {
func elfshname(name string) *ElfShdr {
for i := 0; i < nelfstr; i++ {
if name == elfstr[i].s {
if name != elfstr[i].s {
continue
}
off := elfstr[i].off
for i = 0; i < int(ehdr.shnum); i++ {
sh := shdr[i]
@ -1621,7 +1622,6 @@ func elfshname(name string) *ElfShdr {
}
return newElfShdr(int64(off))
}
}
Exitf("cannot find elf name %s", name)
return nil
}

6
src/cmd/link/internal/ld/ldelf.go
View File

@ -279,7 +279,6 @@ type ElfObj struct {
e binary.ByteOrder
sect []ElfSect
nsect uint
shstrtab string
nsymtab int
symtab *ElfSect
symstr *ElfSect
@ -426,7 +425,9 @@ func parseArmAttributes(ctxt *Link, e binary.ByteOrder, data []byte) {
subsectiondata := sectiondata[sz+4 : subsectionsize]
sectiondata = sectiondata[subsectionsize:]
if subsectiontag == TagFile {
if subsectiontag != TagFile {
continue
}
attrList := elfAttributeList{data: subsectiondata}
for !attrList.done() {
attr := attrList.armAttr()
@ -440,7 +441,6 @@ func parseArmAttributes(ctxt *Link, e binary.ByteOrder, data []byte) {
}
}
}
}
}
func ldelf(ctxt *Link, f *bio.Reader, pkg string, length int64, pn string) {

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

@ -574,7 +574,7 @@ func (ctxt *Link) loadlib() {
if typeSymbolMangling(ctxt) {
*FlagW = true // disable DWARF generation
for _, s := range ctxt.Syms.Allsym {
newName := typeSymbolMangle(ctxt.Syms, s.Name)
newName := typeSymbolMangle(s.Name)
if newName != s.Name {
ctxt.Syms.Rename(s.Name, newName, int(s.Version))
}
@ -657,7 +657,7 @@ func typeSymbolMangling(ctxt *Link) bool {
}
// typeSymbolMangle mangles the given symbol name into something shorter.
func typeSymbolMangle(syms *sym.Symbols, name string) string {
func typeSymbolMangle(name string) string {
if !strings.HasPrefix(name, "type.") {
return name
}

6
src/cmd/link/internal/ld/link.go
View File

@ -96,9 +96,9 @@ func (ctxt *Link) FixedFrameSize() int64 {
}
}
func (l *Link) Logf(format string, args ...interface{}) {
fmt.Fprintf(l.Bso, format, args...)
l.Bso.Flush()
func (ctxt *Link) Logf(format string, args ...interface{}) {
fmt.Fprintf(ctxt.Bso, format, args...)
ctxt.Bso.Flush()
}
func addImports(ctxt *Link, l *sym.Library, pn string) {

2
src/cmd/link/internal/ld/macho.go
View File

@ -180,7 +180,7 @@ var nsortsym int
// "big enough" header size. The initial header is
// one page, the non-dynamic library stuff takes
// up about 1300 bytes; we overestimate that as 2k.
var loadBudget int = INITIAL_MACHO_HEADR - 2*1024
var loadBudget = INITIAL_MACHO_HEADR - 2*1024
func getMachoHdr() *MachoHdr {
return &machohdr

2
src/cmd/link/internal/ld/macho_combine_dwarf.go
View File

@ -17,7 +17,7 @@ import (
var realdwarf, linkseg *macho.Segment
var dwarfstart, linkstart int64
var dwarfaddr, linkaddr int64
var dwarfaddr int64
var linkoffset uint32
const (

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

@ -73,7 +73,7 @@ func putelfsyment(out *OutBuf, off int, addr int64, size int64, info int, shndx
}
}
var numelfsym int = 1 // 0 is reserved
var numelfsym = 1 // 0 is reserved
var elfbind int
@ -592,7 +592,7 @@ func (ctxt *Link) symtab() {
// pkghashes[i].name
addgostring(ctxt, pkghashes, fmt.Sprintf("go.link.pkgname.%d", i), l.Pkg)
// pkghashes[i].linktimehash
addgostring(ctxt, pkghashes, fmt.Sprintf("go.link.pkglinkhash.%d", i), string(l.Hash))
addgostring(ctxt, pkghashes, fmt.Sprintf("go.link.pkglinkhash.%d", i), l.Hash)
// pkghashes[i].runtimehash
hash := ctxt.Syms.ROLookup("go.link.pkghash."+l.Pkg, 0)
pkghashes.AddAddr(ctxt.Arch, hash)