diff options
author | Keith Randall <khr@golang.org> | 2016-10-11 08:36:38 -0700 |
---|---|---|
committer | Keith Randall <khr@golang.org> | 2016-10-12 20:41:23 +0000 |
commit | 442de98c14d49bf306ab880e9f9c898ca0ae7c19 (patch) | |
tree | ecad31c2e5b001801ae5d0afe792f8587532ae67 /test/live.go | |
parent | 55ef67f2f85c51d415a030ae144a0b3301a097bd (diff) | |
download | go-442de98c14d49bf306ab880e9f9c898ca0ae7c19.tar.gz go-442de98c14d49bf306ab880e9f9c898ca0ae7c19.zip |
cmd/compile,runtime: redo how map assignments work
To compile:
m[k] = v
instead of:
mapassign(maptype, m, &k, &v), do
do:
*mapassign(maptype, m, &k) = v
mapassign returns a pointer to the value slot in the map. It is just
like mapaccess except that it will allocate a new slot if k is not
already present in the map.
This makes map accesses faster but potentially larger (codewise).
It is faster because the write into the map is done when the compiler
knows the concrete type, so it can be done with a few store
instructions instead of calling typedmemmove. We also potentially
avoid stack temporaries to hold v.
The code can be larger when the map has pointers in its value type,
since there is a write barrier call in addition to the mapassign call.
That makes the code at the callsite a bit bigger (go binary is 0.3%
bigger).
This CL is in preparation for doing operations like m[k] += v with
only a single runtime call. That will roughly double the speed of
such operations.
Update #17133
Update #5147
Change-Id: Ia435f032090a2ed905dac9234e693972fe8c2dc5
Reviewed-on: https://go-review.googlesource.com/30815
Run-TryBot: Keith Randall <khr@golang.org>
Reviewed-by: Matthew Dempsky <mdempsky@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Diffstat (limited to 'test/live.go')
-rw-r--r-- | test/live.go | 33 |
1 files changed, 17 insertions, 16 deletions
diff --git a/test/live.go b/test/live.go index 74548231dd..9ec251aa61 100644 --- a/test/live.go +++ b/test/live.go @@ -268,33 +268,34 @@ var m2 map[[2]string]*byte var x2 [2]string var bp *byte -func f17a() { - // value temporary only +func f17a(p *byte) { // ERROR "live at entry to f17a: p$" if b { - m2[x2] = nil // ERROR "live at call to mapassign1: autotmp_[0-9]+$" + m2[x2] = p // ERROR "live at call to mapassign: p$" } - m2[x2] = nil // ERROR "live at call to mapassign1: autotmp_[0-9]+$" - m2[x2] = nil // ERROR "live at call to mapassign1: autotmp_[0-9]+$" + m2[x2] = p // ERROR "live at call to mapassign: p$" + m2[x2] = p // ERROR "live at call to mapassign: p$" } -func f17b() { - // key temporary only +func f17b(p *byte) { // ERROR "live at entry to f17b: p$" + // key temporary if b { - m2s["x"] = bp // ERROR "live at call to mapassign1: autotmp_[0-9]+$" + m2s["x"] = p // ERROR "live at call to mapassign: p autotmp_[0-9]+$" } - m2s["x"] = bp // ERROR "live at call to mapassign1: autotmp_[0-9]+$" - m2s["x"] = bp // ERROR "live at call to mapassign1: autotmp_[0-9]+$" + m2s["x"] = p // ERROR "live at call to mapassign: p autotmp_[0-9]+$" + m2s["x"] = p // ERROR "live at call to mapassign: p autotmp_[0-9]+$" } func f17c() { // key and value temporaries if b { - m2s["x"] = nil // ERROR "live at call to mapassign1: autotmp_[0-9]+ autotmp_[0-9]+$" + m2s["x"] = f17d() // ERROR "live at call to f17d: autotmp_[0-9]+$" "live at call to mapassign: autotmp_[0-9]+ autotmp_[0-9]+$" } - m2s["x"] = nil // ERROR "live at call to mapassign1: autotmp_[0-9]+ autotmp_[0-9]+$" - m2s["x"] = nil // ERROR "live at call to mapassign1: autotmp_[0-9]+ autotmp_[0-9]+$" + m2s["x"] = f17d() // ERROR "live at call to f17d: autotmp_[0-9]+$" "live at call to mapassign: autotmp_[0-9]+ autotmp_[0-9]+$" + m2s["x"] = f17d() // ERROR "live at call to f17d: autotmp_[0-9]+$" "live at call to mapassign: autotmp_[0-9]+ autotmp_[0-9]+$" } +func f17d() *byte + func g18() [2]string func f18() { @@ -360,10 +361,10 @@ func f24() { // key temporary for map access using array literal key. // value temporary too. if b { - m2[[2]string{"x", "y"}] = nil // ERROR "live at call to mapassign1: autotmp_[0-9]+ autotmp_[0-9]+$" + m2[[2]string{"x", "y"}] = nil // ERROR "live at call to mapassign: autotmp_[0-9]+$" } - m2[[2]string{"x", "y"}] = nil // ERROR "live at call to mapassign1: autotmp_[0-9]+ autotmp_[0-9]+$" - m2[[2]string{"x", "y"}] = nil // ERROR "live at call to mapassign1: autotmp_[0-9]+ autotmp_[0-9]+$" + m2[[2]string{"x", "y"}] = nil // ERROR "live at call to mapassign: autotmp_[0-9]+$" + m2[[2]string{"x", "y"}] = nil // ERROR "live at call to mapassign: autotmp_[0-9]+$" } // defer should not cause spurious ambiguously live variables |