cmd/compile: find last StoreWB explicitly

In writebarrier phase, a chain of StoreWBs is rewritten to branchy
code to invoke write barriers, and the last store in the chain is
spliced into a Phi op to join the memory of the two branches. We
must find the last store explicitly, since the values are not
scheduled and they may not come in dependency order.

Fixes #18169.

Change-Id: If547e3c562ef0669bc5622c1bb711904dc36314d
Reviewed-on: https://go-review.googlesource.com/33915
Run-TryBot: Cherry Zhang <cherryyz@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
This commit is contained in:
Cherry Zhang 2016-12-03 19:17:16 -05:00
parent af67f7de3f
commit ed0b232cdc
4 changed files with 82 additions and 16 deletions

View file

@ -78,7 +78,6 @@ func writebarrier(f *Func) {
defer f.retSparseSet(wbs)
}
mem := v.Args[2]
line := v.Line
// there may be a sequence of WB stores in the current block. find them.
@ -106,6 +105,20 @@ func writebarrier(f *Func) {
}
}
// find the memory before the WB stores
// this memory is not a WB store but it is used in a WB store.
var mem *Value
for _, w := range storeWBs {
a := w.Args[len(w.Args)-1]
if wbs.contains(a.ID) {
continue
}
if mem != nil {
b.Fatalf("two stores live simultaneously: %s, %s", mem, a)
}
mem = a
}
b.Values = append(b.Values[:i], others...) // move WB ops out of this block
bThen := f.NewBlock(BlockPlain)
@ -177,20 +190,39 @@ func writebarrier(f *Func) {
// which may be used in subsequent blocks. Other memories in the
// sequence must be dead after this block since there can be only
// one memory live.
v = storeWBs[len(storeWBs)-1]
bEnd.Values = append(bEnd.Values, v)
v.Block = bEnd
v.reset(OpPhi)
v.Type = TypeMem
v.AddArg(memThen)
v.AddArg(memElse)
for _, w := range storeWBs[:len(storeWBs)-1] {
for _, a := range w.Args {
a.Uses--
last := storeWBs[0]
if len(storeWBs) > 1 {
// find the last store
last = nil
wbs.clear() // we reuse wbs to record WB stores that is used in another WB store
for _, w := range storeWBs {
wbs.add(w.Args[len(w.Args)-1].ID)
}
for _, w := range storeWBs {
if wbs.contains(w.ID) {
continue
}
if last != nil {
b.Fatalf("two stores live simultaneously: %s, %s", last, w)
}
last = w
}
}
for _, w := range storeWBs[:len(storeWBs)-1] {
f.freeValue(w)
bEnd.Values = append(bEnd.Values, last)
last.Block = bEnd
last.reset(OpPhi)
last.Type = TypeMem
last.AddArg(memThen)
last.AddArg(memElse)
for _, w := range storeWBs {
if w != last {
w.resetArgs()
}
}
for _, w := range storeWBs {
if w != last {
f.freeValue(w)
}
}
if f.Config.fe.Debug_wb() {