From: Josh Bleecher Snyder <josharian@gmail.com>
Date: Tue, 15 Mar 2016 05:28:04 +0000 (-0700)
Subject: cmd/internal/obj: remove LSym.Etext
X-Git-Tag: go1.7beta1~1277
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=31a9e505241e22e4b6ee623419db601334158101;p=gostls13.git

cmd/internal/obj: remove LSym.Etext

Use a local variable instead.

Passes toolstash -cmp.

Change-Id: I9623a40ff0d568f11afd1279b6aaa1c33eda644c
Reviewed-on: https://go-review.googlesource.com/20730
Reviewed-by: Ian Lance Taylor <iant@golang.org>
---

diff --git a/src/cmd/internal/obj/link.go b/src/cmd/internal/obj/link.go
index 835890d601..cbf4bf4183 100644
--- a/src/cmd/internal/obj/link.go
+++ b/src/cmd/internal/obj/link.go
@@ -337,7 +337,6 @@ type LSym struct {
 	Gotype *LSym
 	Autom  *Auto
 	Text   *Prog
-	Etext  *Prog
 	Pcln   *Pcln
 	P      []byte
 	R      []Reloc
diff --git a/src/cmd/internal/obj/objfile.go b/src/cmd/internal/obj/objfile.go
index 70c2d9d5f9..f782644d88 100644
--- a/src/cmd/internal/obj/objfile.go
+++ b/src/cmd/internal/obj/objfile.go
@@ -131,6 +131,7 @@ func flushplist(ctxt *Link, freeProgs bool) {
 	// Ignore ctxt->plist boundaries. There are no guarantees there,
 	// and the assemblers just use one big list.
 	var curtext *LSym
+	var etext *Prog
 	var text []*LSym
 
 	for pl := ctxt.Plist; pl != nil; pl = pl.Link {
@@ -228,7 +229,7 @@ func flushplist(ctxt *Link, freeProgs bool) {
 				}
 				s.Type = STEXT
 				s.Text = p
-				s.Etext = p
+				etext = p
 				curtext = s
 				continue
 
@@ -247,11 +248,11 @@ func flushplist(ctxt *Link, freeProgs bool) {
 			}
 
 			if curtext == nil {
+				etext = nil
 				continue
 			}
-			s := curtext
-			s.Etext.Link = p
-			s.Etext = p
+			etext.Link = p
+			etext = p
 		}
 	}
 
@@ -293,7 +294,6 @@ func flushplist(ctxt *Link, freeProgs bool) {
 		linkpcln(ctxt, s)
 		if freeProgs {
 			s.Text = nil
-			s.Etext = nil
 		}
 	}
 
diff --git a/src/cmd/internal/obj/sizeof_test.go b/src/cmd/internal/obj/sizeof_test.go
index 28dbba888d..14bdbe20dc 100644
--- a/src/cmd/internal/obj/sizeof_test.go
+++ b/src/cmd/internal/obj/sizeof_test.go
@@ -23,7 +23,7 @@ func TestSizeof(t *testing.T) {
 		_64bit uintptr     // size on 64bit platforms
 	}{
 		{Addr{}, 52, 80},
-		{LSym{}, 88, 152},
+		{LSym{}, 84, 144},
 		{Prog{}, 196, 288},
 	}