From 4aff713ddb28ff242588616ccc60c2aa9f654a5c Mon Sep 17 00:00:00 2001 From: Russ Cox Date: Tue, 22 Aug 2017 22:50:27 -0400 Subject: [dev.boringcrypto.go1.8] cmd/link: work around DWARF symbol bug The DWARF code is mishandling the case when the host object files define multiple (distinct) symbols with the same name. They are mapped to the same DWARF debug symbol, which then appears on the dwarfp list multiple times, which then breaks the code that processes the list. Detect duplicates and skip them, because that's trivial, instead of fixing the underlying problem. See #21566. Change-Id: Ib5a34c891d7c15f4c7bb6239d8f31a1ec767b8bc Reviewed-on: https://go-review.googlesource.com/57943 Run-TryBot: Russ Cox TryBot-Result: Gobot Gobot Reviewed-by: Ian Lance Taylor Reviewed-on: https://go-review.googlesource.com/58070 Reviewed-by: Adam Langley --- src/cmd/link/internal/ld/data.go | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go index aca8973a85..2e5db616cd 100644 --- a/src/cmd/link/internal/ld/data.go +++ b/src/cmd/link/internal/ld/data.go @@ -1836,6 +1836,11 @@ func (ctxt *Link) dodata() { datsize = Rnd(datsize, int64(sect.Align)) sect.Vaddr = uint64(datsize) for _, s := range dwarfp[i:] { + // Syms can (incorrectly) appear twice on the list. Ignore repeats. + // See golang.org/issue/21566. + if s.Type == obj.SRODATA { + continue + } if s.Type != obj.SDWARFINFO { break } -- cgit v1.2.3-54-g00ecf