diff options
author | Cherry Zhang <cherryyz@google.com> | 2020-11-08 15:18:35 -0500 |
---|---|---|
committer | Cherry Zhang <cherryyz@google.com> | 2021-03-24 14:38:53 +0000 |
commit | e8700f1ce6f4103207f470cce443f04377baa600 (patch) | |
tree | 9f9bb1d99a7209b6f1500ca2e688d4765fb248ec /src/cmd | |
parent | 747f426944b1c0c3a26537ef78cb6c5bd4d05cde (diff) | |
download | go-e8700f1ce6f4103207f470cce443f04377baa600.tar.gz go-e8700f1ce6f4103207f470cce443f04377baa600.zip |
cmd/compile, cmd/link: use weak reference in itab
When converting a type T to a non-empty interface I, we build the
itab which contains the code pointers of the methods. Currently,
this brings those methods live (if the itab is live), even if the
interface method is never used. This CL changes the itab to use
weak references, so the methods can be pruned if not otherwise
live.
Fixes #42421.
Change-Id: Iee5de2ba11d603c5a102a2ba60440d839a7f9702
Reviewed-on: https://go-review.googlesource.com/c/go/+/268479
Trust: Cherry Zhang <cherryyz@google.com>
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Go Bot <gobot@golang.org>
Reviewed-by: Than McIntosh <thanm@google.com>
Diffstat (limited to 'src/cmd')
-rw-r--r-- | src/cmd/compile/internal/objw/objw.go | 7 | ||||
-rw-r--r-- | src/cmd/compile/internal/reflectdata/reflect.go | 2 | ||||
-rw-r--r-- | src/cmd/internal/obj/data.go | 7 | ||||
-rw-r--r-- | src/cmd/internal/objabi/reloctype.go | 1 | ||||
-rw-r--r-- | src/cmd/link/internal/ld/data.go | 7 | ||||
-rw-r--r-- | src/cmd/link/internal/ld/deadcode.go | 3 | ||||
-rw-r--r-- | src/cmd/link/internal/ld/lib.go | 3 | ||||
-rw-r--r-- | src/cmd/link/internal/ld/testdata/deadcode/ifacemethod4.go | 2 |
8 files changed, 31 insertions, 1 deletions
diff --git a/src/cmd/compile/internal/objw/objw.go b/src/cmd/compile/internal/objw/objw.go index 50ce7b747d..ed5ad754d9 100644 --- a/src/cmd/compile/internal/objw/objw.go +++ b/src/cmd/compile/internal/objw/objw.go @@ -46,6 +46,13 @@ func SymPtr(s *obj.LSym, off int, x *obj.LSym, xoff int) int { return off } +func SymPtrWeak(s *obj.LSym, off int, x *obj.LSym, xoff int) int { + off = int(types.Rnd(int64(off), int64(types.PtrSize))) + s.WriteWeakAddr(base.Ctxt, int64(off), types.PtrSize, x, int64(xoff)) + off += types.PtrSize + return off +} + func SymPtrOff(s *obj.LSym, off int, x *obj.LSym) int { s.WriteOff(base.Ctxt, int64(off), x, 0) off += 4 diff --git a/src/cmd/compile/internal/reflectdata/reflect.go b/src/cmd/compile/internal/reflectdata/reflect.go index 0e1de35887..4c974ea324 100644 --- a/src/cmd/compile/internal/reflectdata/reflect.go +++ b/src/cmd/compile/internal/reflectdata/reflect.go @@ -1338,7 +1338,7 @@ func WriteTabs() { o = objw.Uint32(i.lsym, o, types.TypeHash(i.t)) // copy of type hash o += 4 // skip unused field for _, fn := range genfun(i.t, i.itype) { - o = objw.SymPtr(i.lsym, o, fn, 0) // method pointer for each method + o = objw.SymPtrWeak(i.lsym, o, fn, 0) // method pointer for each method } // Nothing writes static itabs, so they are read only. objw.Global(i.lsym, int32(o), int16(obj.DUPOK|obj.RODATA)) diff --git a/src/cmd/internal/obj/data.go b/src/cmd/internal/obj/data.go index f32e07acfe..bcba53c3a4 100644 --- a/src/cmd/internal/obj/data.go +++ b/src/cmd/internal/obj/data.go @@ -135,6 +135,13 @@ func (s *LSym) WriteAddr(ctxt *Link, off int64, siz int, rsym *LSym, roff int64) s.writeAddr(ctxt, off, siz, rsym, roff, objabi.R_ADDR) } +// WriteWeakAddr writes an address of size siz into s at offset off. +// rsym and roff specify the relocation for the address. +// This is a weak reference. +func (s *LSym) WriteWeakAddr(ctxt *Link, off int64, siz int, rsym *LSym, roff int64) { + s.writeAddr(ctxt, off, siz, rsym, roff, objabi.R_WEAKADDR) +} + // WriteCURelativeAddr writes a pointer-sized address into s at offset off. // rsym and roff specify the relocation for the address which will be // resolved by the linker to an offset from the DW_AT_low_pc attribute of diff --git a/src/cmd/internal/objabi/reloctype.go b/src/cmd/internal/objabi/reloctype.go index 217d8565f2..b241127b4e 100644 --- a/src/cmd/internal/objabi/reloctype.go +++ b/src/cmd/internal/objabi/reloctype.go @@ -258,6 +258,7 @@ const ( // reachable. R_WEAK = -1 << 15 + R_WEAKADDR = R_WEAK | R_ADDR R_WEAKADDROFF = R_WEAK | R_ADDROFF ) diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go index 6de2d893ae..b909526de8 100644 --- a/src/cmd/link/internal/ld/data.go +++ b/src/cmd/link/internal/ld/data.go @@ -306,6 +306,10 @@ func (st *relocSymState) relocsym(s loader.Sym, P []byte) { log.Fatalf("cannot handle R_TLS_IE (sym %s) when linking internally", ldr.SymName(s)) } case objabi.R_ADDR: + if weak && !ldr.AttrReachable(rs) { + // Redirect it to runtime.unreachableMethod, which will throw if called. + rs = syms.unreachableMethod + } if target.IsExternal() { nExtReloc++ @@ -586,6 +590,9 @@ func extreloc(ctxt *Link, ldr *loader.Loader, s loader.Sym, r loader.Reloc) (loa case objabi.R_ADDR: // set up addend for eventual relocation via outer symbol. rs := ldr.ResolveABIAlias(r.Sym()) + if r.Weak() && !ldr.AttrReachable(rs) { + rs = ctxt.ArchSyms.unreachableMethod + } rs, off := FoldSubSymbolOffset(ldr, rs) rr.Xadd = r.Add() + off rr.Xsym = rs diff --git a/src/cmd/link/internal/ld/deadcode.go b/src/cmd/link/internal/ld/deadcode.go index 33468b429c..9b04e2cddc 100644 --- a/src/cmd/link/internal/ld/deadcode.go +++ b/src/cmd/link/internal/ld/deadcode.go @@ -64,6 +64,9 @@ func (d *deadcodePass) init() { } } names = append(names, *flagEntrySymbol) + // runtime.unreachableMethod is a function that will throw if called. + // We redirect unreachable methods to it. + names = append(names, "runtime.unreachableMethod") if !d.ctxt.linkShared && d.ctxt.BuildMode != BuildModePlugin { // runtime.buildVersion and runtime.modinfo are referenced in .go.buildinfo section // (see function buildinfo in data.go). They should normally be reachable from the diff --git a/src/cmd/link/internal/ld/lib.go b/src/cmd/link/internal/ld/lib.go index d136cbad80..c80c29a6a8 100644 --- a/src/cmd/link/internal/ld/lib.go +++ b/src/cmd/link/internal/ld/lib.go @@ -118,6 +118,8 @@ type ArchSyms struct { Dynamic loader.Sym DynSym loader.Sym DynStr loader.Sym + + unreachableMethod loader.Sym } // mkArchSym is a helper for setArchSyms, to set up a special symbol. @@ -142,6 +144,7 @@ func (ctxt *Link) setArchSyms() { ctxt.mkArchSym(".dynamic", 0, &ctxt.Dynamic) ctxt.mkArchSym(".dynsym", 0, &ctxt.DynSym) ctxt.mkArchSym(".dynstr", 0, &ctxt.DynStr) + ctxt.mkArchSym("runtime.unreachableMethod", sym.SymVerABIInternal, &ctxt.unreachableMethod) if ctxt.IsPPC64() { ctxt.mkArchSym("TOC", 0, &ctxt.TOC) diff --git a/src/cmd/link/internal/ld/testdata/deadcode/ifacemethod4.go b/src/cmd/link/internal/ld/testdata/deadcode/ifacemethod4.go index 52ee2e3d86..4af47ad1fa 100644 --- a/src/cmd/link/internal/ld/testdata/deadcode/ifacemethod4.go +++ b/src/cmd/link/internal/ld/testdata/deadcode/ifacemethod4.go @@ -10,6 +10,7 @@ package main type T int +//go:noinline func (T) M() {} type I interface{ M() } @@ -20,4 +21,5 @@ var pp *I func main() { p = new(T) // use type T pp = new(I) // use type I + *pp = *p // convert T to I, build itab } |