Commit 6901b084 authored by Ian Lance Taylor's avatar Ian Lance Taylor

cmd/link: avoid name collision with DWARF .def suffix

Adding a .def suffix for DWARF info collided with the DWARF info,
without the suffix, for a method named def. Change the suffix to ..def
instead.

Fixes #15926.

Change-Id: If1bf1bcb5dff1d7f7b79f78e3f7a3bbfcd2201bb
Reviewed-on: https://go-review.googlesource.com/23733
Run-TryBot: Ian Lance Taylor <iant@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: default avatarDavid Crawshaw <crawshaw@golang.org>
parent c3bd93aa
...@@ -529,7 +529,7 @@ func walktypedef(die *DWDie) *DWDie { ...@@ -529,7 +529,7 @@ func walktypedef(die *DWDie) *DWDie {
} }
func walksymtypedef(s *LSym) *LSym { func walksymtypedef(s *LSym) *LSym {
if t := Linkrlookup(Ctxt, s.Name+".def", int(s.Version)); t != nil { if t := Linkrlookup(Ctxt, s.Name+"..def", int(s.Version)); t != nil {
return t return t
} }
return s return s
...@@ -819,7 +819,7 @@ func dotypedef(parent *DWDie, name string, def *DWDie) { ...@@ -819,7 +819,7 @@ func dotypedef(parent *DWDie, name string, def *DWDie) {
Diag("dwarf: bad def in dotypedef") Diag("dwarf: bad def in dotypedef")
} }
def.sym = Linklookup(Ctxt, def.sym.Name+".def", 0) def.sym = Linklookup(Ctxt, def.sym.Name+"..def", 0)
def.sym.Attr |= AttrHidden def.sym.Attr |= AttrHidden
def.sym.Type = obj.SDWARFINFO def.sym.Type = obj.SDWARFINFO
...@@ -1021,7 +1021,7 @@ func newtype(gotype *LSym) *DWDie { ...@@ -1021,7 +1021,7 @@ func newtype(gotype *LSym) *DWDie {
} }
func nameFromDIESym(dwtype *LSym) string { func nameFromDIESym(dwtype *LSym) string {
return strings.TrimSuffix(dwtype.Name[len(infoprefix):], ".def") return strings.TrimSuffix(dwtype.Name[len(infoprefix):], "..def")
} }
// Find or construct *T given T. // Find or construct *T given T.
......
// build
// Copyright 2016 The Go Authors. All rights reserved.
// Use of this source code is governed by a BSD-style
// license that can be found in the LICENSE file.
// Issue 15926: linker was adding .def to the end of symbols, causing
// a name collision with a method actually named def.
package main
type S struct{}
func (s S) def() {}
var I = S.def
func main() {
I(S{})
}
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment