From: Cherry Zhang <cherryyz@google.com>
Date: Sat, 25 Apr 2020 18:25:18 +0000 (-0400)
Subject: [dev.link] cmd/link: remove symbol movement workaround in dodata
X-Git-Tag: go1.15beta1~270^2^2~23
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=26d6d077859c8d778ec51036fb8e9b4676e181b6;p=gostls13.git

[dev.link] cmd/link: remove symbol movement workaround in dodata

It is supposed to work around symbol movement in machosymorder.
But machosymorder doesn't actually move symbols around.

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

diff --git a/src/cmd/link/internal/ld/data.go b/src/cmd/link/internal/ld/data.go
index 4b3bc2ce02..5ab7661d60 100644
--- a/src/cmd/link/internal/ld/data.go
+++ b/src/cmd/link/internal/ld/data.go
@@ -1893,18 +1893,6 @@ func (state *dodataState) allocateDwarfSections2(ctxt *Link) {
 }
 
 func (state *dodataState) dodataSect2(ctxt *Link, symn sym.SymKind, syms []loader.Sym) (result []loader.Sym, maxAlign int32) {
-	if ctxt.HeadType == objabi.Hdarwin {
-		// Some symbols may no longer belong in syms
-		// due to movement in machosymorder.
-		newSyms := make([]loader.Sym, 0, len(syms))
-		for _, s := range syms {
-			if state.symType(s) == symn {
-				newSyms = append(newSyms, s)
-			}
-		}
-		syms = newSyms
-	}
-
 	var head, tail loader.Sym
 	ldr := ctxt.loader
 	for _, s := range syms {