From: Than McIntosh <thanm@google.com>
Date: Thu, 5 Mar 2020 15:58:02 +0000 (-0500)
Subject: [dev.link] cmd/link: check for dwarf enabled in loadlibfull
X-Git-Tag: go1.15beta1~679^2~90
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=24064a302c36b86f2f57932c71aeff876d2afc47;p=gostls13.git

[dev.link] cmd/link: check for dwarf enabled in loadlibfull

Check dwarfEnabled before invoking dwarfConvertSymbols (not needed if
we're not doing dwarf gen).

Change-Id: Id7ea7d11c13524705d305596bf1468d4858216b6
Reviewed-on: https://go-review.googlesource.com/c/go/+/222157
Run-TryBot: Than McIntosh <thanm@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Jeremy Faller <jeremy@golang.org>
---

diff --git a/src/cmd/link/internal/ld/dwarf.go b/src/cmd/link/internal/ld/dwarf.go
index 65b5872a6f..0d8c2acb95 100644
--- a/src/cmd/link/internal/ld/dwarf.go
+++ b/src/cmd/link/internal/ld/dwarf.go
@@ -2068,6 +2068,9 @@ func dwarfGenerateDebugInfo(ctxt *Link) {
 // through dwarf DIE objects and rewrites loader.Sym refs to
 // sym.Symbol there as well. This is obviously a temporary function.
 func dwarfConvertSymbols(ctxt *Link) {
+	if !dwarfEnabled(ctxt) {
+		return
+	}
 	if *FlagNewDw2 {
 		// don't convert since we're running phase 2 with loader
 		return