From: Matthew Dempsky <mdempsky@google.com>
Date: Fri, 25 Aug 2017 22:24:14 +0000 (-0700)
Subject: cmd/compile: merge tempnamel into tempAt
X-Git-Tag: go1.10beta1~1313
X-Git-Url: http://www.git.cypherpunks.su/?a=commitdiff_plain;h=93471a139085fb58b0416e109ba32a927ccf5719;p=gostls13.git

cmd/compile: merge tempnamel into tempAt

Passes toolstash-check.

Change-Id: I01ed1c04be5a23756742d461f13f1e587ea7ecb8
Reviewed-on: https://go-review.googlesource.com/59610
Run-TryBot: Matthew Dempsky <mdempsky@google.com>
Reviewed-by: Josh Bleecher Snyder <josharian@gmail.com>
---

diff --git a/src/cmd/compile/internal/gc/gen.go b/src/cmd/compile/internal/gc/gen.go
index 6b1598e06c..f9b4584cf6 100644
--- a/src/cmd/compile/internal/gc/gen.go
+++ b/src/cmd/compile/internal/gc/gen.go
@@ -39,7 +39,7 @@ func autotmpname(n int) string {
 }
 
 // make a new Node off the books
-func tempnamel(pos src.XPos, curfn *Node, nn *Node, t *types.Type) {
+func tempAt(pos src.XPos, curfn *Node, t *types.Type) *Node {
 	if curfn == nil {
 		Fatalf("no curfn for tempname")
 	}
@@ -61,23 +61,15 @@ func tempnamel(pos src.XPos, curfn *Node, nn *Node, t *types.Type) {
 	n.SetClass(PAUTO)
 	n.Esc = EscNever
 	n.Name.Curfn = curfn
+	n.Name.SetUsed(true)
 	n.Name.SetAutoTemp(true)
 	curfn.Func.Dcl = append(curfn.Func.Dcl, n)
 
 	dowidth(t)
-	*nn = *n
-}
 
-func temp(t *types.Type) *Node {
-	var n Node
-	tempnamel(lineno, Curfn, &n, t)
-	asNode(n.Sym.Def).Name.SetUsed(true)
 	return n.Orig
 }
 
-func tempAt(pos src.XPos, curfn *Node, t *types.Type) *Node {
-	var n Node
-	tempnamel(pos, curfn, &n, t)
-	asNode(n.Sym.Def).Name.SetUsed(true)
-	return n.Orig
+func temp(t *types.Type) *Node {
+	return tempAt(lineno, Curfn, t)
 }