Skip to content

Commit bce9747

Browse files
committed
cmd: remove unused code
Generated with honnef.co/go/unused There is a large amount of unused code in cmd/internal/obj/s390x but that can wait til the s390x port is merged. There is some unused code in cmd/internal/unvendor/golang.org/x/arch/arm/armasm but that should be addressed upstream and a new revision imported. Change-Id: I252c0f9ea8c5bb1a0b530a374ef13a0a20ea56aa Reviewed-on: https://go-review.googlesource.com/21782 Reviewed-by: Brad Fitzpatrick <[email protected]> Run-TryBot: Dave Cheney <[email protected]>
1 parent 93368be commit bce9747

File tree

17 files changed

+7
-106
lines changed

17 files changed

+7
-106
lines changed

src/cmd/internal/goobj/read.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -229,11 +229,8 @@ var (
229229

230230
errCorruptArchive = errors.New("corrupt archive")
231231
errTruncatedArchive = errors.New("truncated archive")
232-
errNotArchive = errors.New("unrecognized archive format")
233-
234-
errCorruptObject = errors.New("corrupt object file")
235-
errTruncatedObject = errors.New("truncated object file")
236-
errNotObject = errors.New("unrecognized object file format")
232+
errCorruptObject = errors.New("corrupt object file")
233+
errNotObject = errors.New("unrecognized object file format")
237234
)
238235

239236
// An objReader is an object file reader.

src/cmd/internal/obj/mips/asm0.go

-4
Original file line numberDiff line numberDiff line change
@@ -974,10 +974,6 @@ func OP_JMP(op uint32, i uint32) uint32 {
974974
return op | i&0x3FFFFFF
975975
}
976976

977-
func oclass(a *obj.Addr) int {
978-
return int(a.Class) - 1
979-
}
980-
981977
func asmout(ctxt *obj.Link, p *obj.Prog, o *Optab, out []uint32) {
982978
o1 := uint32(0)
983979
o2 := uint32(0)

src/cmd/internal/obj/x86/asm6.go

-5
Original file line numberDiff line numberDiff line change
@@ -884,11 +884,6 @@ var yvex_vpbroadcast = []ytab{
884884
{Yxm, Ynone, Yyr, Zvex_rm_v_r, 2},
885885
}
886886

887-
var yvex_xxmyxm = []ytab{
888-
{Yxr, Ynone, Yxm, Zvex_r_v_rm, 2},
889-
{Yyr, Ynone, Yxm, Zvex_r_v_rm, 2},
890-
}
891-
892887
var ymmxmm0f38 = []ytab{
893888
{Ymm, Ynone, Ymr, Zlitm_r, 3},
894889
{Yxm, Ynone, Yxr, Zlitm_r, 5},

src/cmd/internal/obj/x86/obj6_test.go

-1
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,6 @@ func parseTestData(t *testing.T) *ParsedTestData {
7676
}
7777

7878
var spaces_re *regexp.Regexp = regexp.MustCompile("\\s+")
79-
var marker_re *regexp.Regexp = regexp.MustCompile("MOVQ \\$([0-9]+), AX")
8079

8180
func normalize(s string) string {
8281
return spaces_re.ReplaceAllLiteralString(strings.TrimSpace(s), " ")

src/cmd/internal/objfile/pe.go

-2
Original file line numberDiff line numberDiff line change
@@ -69,8 +69,6 @@ func (f *peFile) symbols() ([]Sym, error) {
6969
text = 0x20
7070
data = 0x40
7171
bss = 0x80
72-
permX = 0x20000000
73-
permR = 0x40000000
7472
permW = 0x80000000
7573
)
7674
ch := sect.Characteristics

src/cmd/link/internal/amd64/asm.go

-6
Original file line numberDiff line numberDiff line change
@@ -99,12 +99,6 @@ func gentext() {
9999
ld.Addaddr(ld.Ctxt, initarray_entry, initfunc)
100100
}
101101

102-
func adddynrela(rela *ld.LSym, s *ld.LSym, r *ld.Reloc) {
103-
ld.Addaddrplus(ld.Ctxt, rela, s, int64(r.Off))
104-
ld.Adduint64(ld.Ctxt, rela, ld.R_X86_64_RELATIVE)
105-
ld.Addaddrplus(ld.Ctxt, rela, r.Sym, r.Add) // Addend
106-
}
107-
108102
func adddynrel(s *ld.LSym, r *ld.Reloc) {
109103
targ := r.Sym
110104
ld.Ctxt.Cursym = s

src/cmd/link/internal/arm/asm.go

-5
Original file line numberDiff line numberDiff line change
@@ -114,11 +114,6 @@ func braddoff(a int32, b int32) int32 {
114114
return int32((uint32(a))&0xff000000 | 0x00ffffff&uint32(a+b))
115115
}
116116

117-
func adddynrela(rel *ld.LSym, s *ld.LSym, r *ld.Reloc) {
118-
ld.Addaddrplus(ld.Ctxt, rel, s, int64(r.Off))
119-
ld.Adduint32(ld.Ctxt, rel, ld.R_ARM_RELATIVE)
120-
}
121-
122117
func adddynrel(s *ld.LSym, r *ld.Reloc) {
123118
targ := r.Sym
124119
ld.Ctxt.Cursym = s

src/cmd/link/internal/arm64/asm.go

-4
Original file line numberDiff line numberDiff line change
@@ -91,10 +91,6 @@ func gentext() {
9191
ld.Addaddr(ld.Ctxt, initarray_entry, initfunc)
9292
}
9393

94-
func adddynrela(rel *ld.LSym, s *ld.LSym, r *ld.Reloc) {
95-
log.Fatalf("adddynrela not implemented")
96-
}
97-
9894
func adddynrel(s *ld.LSym, r *ld.Reloc) {
9995
log.Fatalf("adddynrel not implemented")
10096
}

src/cmd/link/internal/ld/data.go

-4
Original file line numberDiff line numberDiff line change
@@ -236,10 +236,6 @@ func addaddrplus4(ctxt *Link, s *LSym, t *LSym, add int64) int64 {
236236
* Used for the data block.
237237
*/
238238

239-
func listnextp(s *LSym) **LSym {
240-
return &s.Next
241-
}
242-
243239
func listsubp(s *LSym) **LSym {
244240
return &s.Sub
245241
}

src/cmd/link/internal/ld/deadcode.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -170,9 +170,7 @@ type methodref struct {
170170
r [3]*Reloc // R_METHOD relocations to fields of runtime.method
171171
}
172172

173-
func (m methodref) mtyp() *LSym { return m.r[0].Sym }
174-
func (m methodref) ifn() *LSym { return m.r[1].Sym }
175-
func (m methodref) tfn() *LSym { return m.r[2].Sym }
173+
func (m methodref) ifn() *LSym { return m.r[1].Sym }
176174

177175
func (m methodref) isExported() bool {
178176
for _, r := range m.m {

src/cmd/link/internal/ld/decodesym.go

-18
Original file line numberDiff line numberDiff line change
@@ -56,11 +56,6 @@ func decodetype_kind(s *LSym) uint8 {
5656
return uint8(s.P[2*SysArch.PtrSize+7] & obj.KindMask) // 0x13 / 0x1f
5757
}
5858

59-
// Type.commonType.kind
60-
func decodetype_noptr(s *LSym) uint8 {
61-
return uint8(s.P[2*SysArch.PtrSize+7] & obj.KindNoPointers) // 0x13 / 0x1f
62-
}
63-
6459
// Type.commonType.kind
6560
func decodetype_usegcprog(s *LSym) uint8 {
6661
return uint8(s.P[2*SysArch.PtrSize+7] & obj.KindGCProg) // 0x13 / 0x1f
@@ -216,19 +211,6 @@ func decodetype_structfieldarrayoff(s *LSym, i int) int {
216211
return off
217212
}
218213

219-
func decodetype_stringptr(s *LSym, off int) string {
220-
s = decode_reloc_sym(s, int32(off))
221-
if s == nil {
222-
return ""
223-
}
224-
r := decode_reloc(s, 0) // s has a pointer to the string data at offset 0
225-
if r == nil { // shouldn't happen.
226-
return ""
227-
}
228-
strlen := int64(decode_inuxi(s.P[SysArch.PtrSize:], SysArch.IntSize))
229-
return string(r.Sym.P[r.Add : r.Add+strlen])
230-
}
231-
232214
// decodetype_name decodes the name from a reflect.name.
233215
func decodetype_name(s *LSym, off int) string {
234216
r := decode_reloc(s, int32(off))

src/cmd/link/internal/ld/go.go

+1-29
Original file line numberDiff line numberDiff line change
@@ -419,35 +419,7 @@ type Pkg struct {
419419
impby []*Pkg
420420
}
421421

422-
var (
423-
// pkgmap records the imported-by relationship between packages.
424-
// Entries are keyed by package path (e.g., "runtime" or "net/url").
425-
pkgmap = map[string]*Pkg{}
426-
427-
pkgall []*Pkg
428-
)
429-
430-
func lookupPkg(path string) *Pkg {
431-
if p, ok := pkgmap[path]; ok {
432-
return p
433-
}
434-
p := &Pkg{path: path}
435-
pkgmap[path] = p
436-
pkgall = append(pkgall, p)
437-
return p
438-
}
439-
440-
// imported records that package pkg imports package imp.
441-
func imported(pkg, imp string) {
442-
// everyone imports runtime, even runtime.
443-
if imp == "runtime" {
444-
return
445-
}
446-
447-
p := lookupPkg(pkg)
448-
i := lookupPkg(imp)
449-
i.impby = append(i.impby, p)
450-
}
422+
var pkgall []*Pkg
451423

452424
func (p *Pkg) cycle() *Pkg {
453425
if p.checked {

src/cmd/link/internal/ld/macho.go

+2-5
Original file line numberDiff line numberDiff line change
@@ -586,11 +586,8 @@ func Asmbmacho() {
586586
// and we can assume OS X.
587587
//
588588
// See golang.org/issues/12941.
589-
const (
590-
LC_VERSION_MIN_MACOSX = 0x24
591-
LC_VERSION_MIN_IPHONEOS = 0x25
592-
LC_VERSION_MIN_WATCHOS = 0x30
593-
)
589+
const LC_VERSION_MIN_MACOSX = 0x24
590+
594591
ml := newMachoLoad(LC_VERSION_MIN_MACOSX, 2)
595592
ml.data[0] = 10<<16 | 7<<8 | 0<<0 // OS X version 10.7.0
596593
ml.data[1] = 10<<16 | 7<<8 | 0<<0 // SDK 10.7.0

src/cmd/link/internal/ld/macho_combine_dwarf.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -15,11 +15,9 @@ import (
1515
"unsafe"
1616
)
1717

18-
var fakedwarf, realdwarf, linkseg *macho.Segment
18+
var realdwarf, linkseg *macho.Segment
1919
var dwarfstart, linkstart int64
2020
var linkoffset uint32
21-
var machHeader *macho.FileHeader
22-
var mappedHeader []byte
2321

2422
const (
2523
LC_ID_DYLIB = 0xd

src/cmd/link/internal/mips64/asm.go

-4
Original file line numberDiff line numberDiff line change
@@ -41,10 +41,6 @@ import (
4141

4242
func gentext() {}
4343

44-
func adddynrela(rel *ld.LSym, s *ld.LSym, r *ld.Reloc) {
45-
log.Fatalf("adddynrela not implemented")
46-
}
47-
4844
func adddynrel(s *ld.LSym, r *ld.Reloc) {
4945
log.Fatalf("adddynrel not implemented")
5046
}

src/cmd/link/internal/ppc64/asm.go

-4
Original file line numberDiff line numberDiff line change
@@ -265,10 +265,6 @@ func gencallstub(abicase int, stub *ld.LSym, targ *ld.LSym) {
265265
ld.Adduint32(ld.Ctxt, stub, 0x4e800420) // bctr
266266
}
267267

268-
func adddynrela(rel *ld.LSym, s *ld.LSym, r *ld.Reloc) {
269-
log.Fatalf("adddynrela not implemented")
270-
}
271-
272268
func adddynrel(s *ld.LSym, r *ld.Reloc) {
273269
targ := r.Sym
274270
ld.Ctxt.Cursym = s

src/cmd/link/internal/x86/asm.go

-4
Original file line numberDiff line numberDiff line change
@@ -139,10 +139,6 @@ func gentext() {
139139
ld.Addaddr(ld.Ctxt, initarray_entry, initfunc)
140140
}
141141

142-
func adddynrela(rela *ld.LSym, s *ld.LSym, r *ld.Reloc) {
143-
log.Fatalf("adddynrela not implemented")
144-
}
145-
146142
func adddynrel(s *ld.LSym, r *ld.Reloc) {
147143
targ := r.Sym
148144
ld.Ctxt.Cursym = s

0 commit comments

Comments
 (0)