cmd/internal/gc: remove namebuf variable
namebuf was a global char buffer in the C version of gc, which was
useful for providing common storage for constructing symbol and file
names. However, now that it's just a global Go string and the string
data is dynamically allocated anyway, it doesn't serve any purpose
except to force extra write barriers everytime it's assigned to.
Also, introduce Lookupf(fmt, args...) as shorthand for
Lookup(fmt.Sprintf(fmt, args...)), which was a very common pattern for
using namebuf.
Passes "go build -toolexec 'toolstash -cmp' -a std".
Notably, this CL shrinks 6g's text section by ~15kB:
$ size toolstash/6g tool/linux_amd64/6g
text data bss dec hex filename
4600805 605968 342988 5549761 54aec1 toolstash/6g
4585547 605968 342956 5534471 547307 tool/linux_amd64/6g
Change-Id: I98abb44fc7f43a2e2e48425cc9f215cd0be37442
Reviewed-on: https://go-review.googlesource.com/7080
Reviewed-by: Ian Lance Taylor <iant@golang.org>
diff --git a/src/cmd/internal/gc/closure.go b/src/cmd/internal/gc/closure.go
index 3155b69..df89544 100644
--- a/src/cmd/internal/gc/closure.go
+++ b/src/cmd/internal/gc/closure.go
@@ -174,8 +174,7 @@
} else {
Fatal("closurename called for %v", Nconv(n, obj.FmtShort))
}
- namebuf = fmt.Sprintf("%s.%s%d", outer, prefix, gen)
- n.Sym = Lookup(namebuf)
+ n.Sym = Lookupf("%s.%s%d", outer, prefix, gen)
return n.Sym
}
@@ -333,9 +332,7 @@
// we introduce function param &v *T
// and v remains PPARAMREF with &v heapaddr
// (accesses will implicitly deref &v).
- namebuf = fmt.Sprintf("&%s", v.Sym.Name)
-
- addr = newname(Lookup(namebuf))
+ addr = newname(Lookupf("&%s", v.Sym.Name))
addr.Type = Ptrto(v.Type)
addr.Class = PPARAM
v.Heapaddr = addr
@@ -397,9 +394,7 @@
} else {
// Declare variable holding addresses taken from closure
// and initialize in entry prologue.
- namebuf = fmt.Sprintf("&%s", v.Sym.Name)
-
- addr = newname(Lookup(namebuf))
+ addr = newname(Lookupf("&%s", v.Sym.Name))
addr.Ntype = Nod(OIND, typenod(v.Type), nil)
addr.Class = PAUTO
addr.Used = true
@@ -557,9 +552,8 @@
var fld *Node
var n *Node
for t := getinargx(t0).Type; t != nil; t = t.Down {
- namebuf = fmt.Sprintf("a%d", i)
+ n = newname(Lookupf("a%d", i))
i++
- n = newname(Lookup(namebuf))
n.Class = PPARAM
xfunc.Dcl = list(xfunc.Dcl, n)
callargs = list(callargs, n)
@@ -577,9 +571,8 @@
l = nil
var retargs *NodeList
for t := getoutargx(t0).Type; t != nil; t = t.Down {
- namebuf = fmt.Sprintf("r%d", i)
+ n = newname(Lookupf("r%d", i))
i++
- n = newname(Lookup(namebuf))
n.Class = PPARAMOUT
xfunc.Dcl = list(xfunc.Dcl, n)
retargs = list(retargs, n)
