Skip to content

Commit

Permalink
cmd/link: avoid name collision with DWARF .def suffix
Browse files Browse the repository at this point in the history
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 <[email protected]>
TryBot-Result: Gobot Gobot <[email protected]>
Reviewed-by: David Crawshaw <[email protected]>
  • Loading branch information
ianlancetaylor committed Jun 3, 2016
1 parent c3bd93a commit 6901b08
Show file tree
Hide file tree
Showing 2 changed files with 23 additions and 3 deletions.
6 changes: 3 additions & 3 deletions src/cmd/link/internal/ld/dwarf.go
Original file line number Diff line number Diff line change
Expand Up @@ -529,7 +529,7 @@ func walktypedef(die *DWDie) *DWDie {
}

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 s
Expand Down Expand Up @@ -819,7 +819,7 @@ func dotypedef(parent *DWDie, name string, def *DWDie) {
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.Type = obj.SDWARFINFO

Expand Down Expand Up @@ -1021,7 +1021,7 @@ func newtype(gotype *LSym) *DWDie {
}

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.
Expand Down
20 changes: 20 additions & 0 deletions test/fixedbugs/issue15926.go
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
// 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{})
}

0 comments on commit 6901b08

Please sign in to comment.