cmd/compile: keep value use counts in SSA
Keep track of how many uses each Value has. Each appearance in
Value.Args and in Block.Control counts once.
The number of uses of a value is generically useful to
constrain rewrite rules. For instance, we might want to
prevent merging index operations into loads if the same
index expression is used lots of times.
But I have one use in particular for which the use count is required.
We must make sure we don't combine ops with loads if the load has
more than one use. Otherwise, we may split a single load
into multiple loads and that breaks perceived behavior in
the presence of races. In particular, the load of m.state
in sync/mutex.go:Lock can't be done twice. (I have a separate
CL which triggers the mutex failure. This CL has a test which
demonstrates a similar failure.)
Change-Id: Icaafa479239f48632a069d0c3f624e6ebc6b1f0e
Reviewed-on: https://go-review.googlesource.com/20790
Run-TryBot: Keith Randall <khr@golang.org>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Todd Neal <todd@tneal.org>
diff --git a/src/cmd/compile/internal/gc/ssa.go b/src/cmd/compile/internal/gc/ssa.go
index 6bf5899..716be35 100644
--- a/src/cmd/compile/internal/gc/ssa.go
+++ b/src/cmd/compile/internal/gc/ssa.go
@@ -540,7 +540,7 @@
m := s.mem()
b := s.endBlock()
b.Kind = ssa.BlockExit
- b.Control = m
+ b.SetControl(m)
// TODO: never rewrite OPANIC to OCALLFUNC in the
// first place. Need to wait until all backends
// go through SSA.
@@ -920,7 +920,7 @@
m := s.mem()
b := s.endBlock()
b.Kind = ssa.BlockRet
- b.Control = m
+ b.SetControl(m)
return b
}
@@ -1795,7 +1795,7 @@
b := s.endBlock()
b.Kind = ssa.BlockIf
- b.Control = el
+ b.SetControl(el)
// In theory, we should set b.Likely here based on context.
// However, gc only gives us likeliness hints
// in a single place, for plain OIF statements,
@@ -2039,7 +2039,7 @@
b := s.endBlock()
b.Kind = ssa.BlockIf
b.Likely = ssa.BranchUnlikely
- b.Control = cmp
+ b.SetControl(cmp)
b.AddEdgeTo(grow)
b.AddEdgeTo(assign)
@@ -2143,7 +2143,7 @@
c := s.expr(cond)
b := s.endBlock()
b.Kind = ssa.BlockIf
- b.Control = c
+ b.SetControl(c)
b.Likely = ssa.BranchPrediction(likely) // gc and ssa both use -1/0/+1 for likeliness
b.AddEdgeTo(yes)
b.AddEdgeTo(no)
@@ -2396,7 +2396,7 @@
s.vars[&memVar] = call
b := s.endBlock()
b.Kind = ssa.BlockCall
- b.Control = call
+ b.SetControl(call)
b.AddEdgeTo(bNext)
if k == callDefer {
// Add recover edge to exit code.
@@ -2654,7 +2654,7 @@
chk := s.newValue2(ssa.OpNilCheck, ssa.TypeVoid, ptr, s.mem())
b := s.endBlock()
b.Kind = ssa.BlockCheck
- b.Control = chk
+ b.SetControl(chk)
bNext := s.f.NewBlock(ssa.BlockPlain)
b.AddEdgeTo(bNext)
s.startBlock(bNext)
@@ -2692,7 +2692,7 @@
func (s *state) check(cmp *ssa.Value, fn *Node) {
b := s.endBlock()
b.Kind = ssa.BlockIf
- b.Control = cmp
+ b.SetControl(cmp)
b.Likely = ssa.BranchLikely
bNext := s.f.NewBlock(ssa.BlockPlain)
line := s.peekLine()
@@ -2740,7 +2740,7 @@
b := s.endBlock()
if !returns {
b.Kind = ssa.BlockExit
- b.Control = call
+ b.SetControl(call)
call.AuxInt = off
if len(results) > 0 {
Fatalf("panic call can't have results")
@@ -2748,7 +2748,7 @@
return nil
}
b.Kind = ssa.BlockCall
- b.Control = call
+ b.SetControl(call)
bNext := s.f.NewBlock(ssa.BlockPlain)
b.AddEdgeTo(bNext)
s.startBlock(bNext)
@@ -2793,7 +2793,7 @@
b := s.endBlock()
b.Kind = ssa.BlockIf
b.Likely = ssa.BranchUnlikely
- b.Control = flag
+ b.SetControl(flag)
b.AddEdgeTo(bThen)
b.AddEdgeTo(bElse)
@@ -2838,7 +2838,7 @@
b := s.endBlock()
b.Kind = ssa.BlockIf
b.Likely = ssa.BranchUnlikely
- b.Control = flag
+ b.SetControl(flag)
b.AddEdgeTo(bThen)
b.AddEdgeTo(bElse)
@@ -3049,7 +3049,7 @@
b := s.endBlock()
b.Kind = ssa.BlockIf
b.Likely = ssa.BranchLikely
- b.Control = cmp
+ b.SetControl(cmp)
// Generate code for non-zero length slice case.
nz := s.f.NewBlock(ssa.BlockPlain)
@@ -3150,7 +3150,7 @@
cmp := s.newValue2(cvttab.geq, Types[TBOOL], x, s.zeroVal(ft))
b := s.endBlock()
b.Kind = ssa.BlockIf
- b.Control = cmp
+ b.SetControl(cmp)
b.Likely = ssa.BranchLikely
bThen := s.f.NewBlock(ssa.BlockPlain)
@@ -3198,7 +3198,7 @@
cmp := s.newValue2(ssa.OpEqPtr, Types[TBOOL], x, nilValue)
b := s.endBlock()
b.Kind = ssa.BlockIf
- b.Control = cmp
+ b.SetControl(cmp)
b.Likely = ssa.BranchUnlikely
bThen := s.f.NewBlock(ssa.BlockPlain)
@@ -3269,7 +3269,7 @@
cmp := s.newValue2(cvttab.ltf, Types[TBOOL], x, twoToThe63)
b := s.endBlock()
b.Kind = ssa.BlockIf
- b.Control = cmp
+ b.SetControl(cmp)
b.Likely = ssa.BranchLikely
bThen := s.f.NewBlock(ssa.BlockPlain)
@@ -3318,7 +3318,7 @@
isnonnil := s.newValue2(ssa.OpNeqPtr, Types[TBOOL], tab, s.constNil(byteptr))
b := s.endBlock()
b.Kind = ssa.BlockIf
- b.Control = isnonnil
+ b.SetControl(isnonnil)
b.Likely = ssa.BranchLikely
bLoad := s.f.NewBlock(ssa.BlockPlain)
@@ -3360,7 +3360,7 @@
cond := s.newValue2(ssa.OpEqPtr, Types[TBOOL], typ, target)
b := s.endBlock()
b.Kind = ssa.BlockIf
- b.Control = cond
+ b.SetControl(cond)
b.Likely = ssa.BranchLikely
byteptr := Ptrto(Types[TUINT8])
diff --git a/src/cmd/compile/internal/ssa/block.go b/src/cmd/compile/internal/ssa/block.go
index 2e520da..ffe4615 100644
--- a/src/cmd/compile/internal/ssa/block.go
+++ b/src/cmd/compile/internal/ssa/block.go
@@ -97,6 +97,16 @@
return s
}
+func (b *Block) SetControl(v *Value) {
+ if w := b.Control; w != nil {
+ w.Uses--
+ }
+ b.Control = v
+ if v != nil {
+ v.Uses++
+ }
+}
+
// AddEdgeTo adds an edge from block b to block c. Used during building of the
// SSA graph; do not use on an already-completed SSA graph.
func (b *Block) AddEdgeTo(c *Block) {
diff --git a/src/cmd/compile/internal/ssa/check.go b/src/cmd/compile/internal/ssa/check.go
index 8f82277..85cc3ea 100644
--- a/src/cmd/compile/internal/ssa/check.go
+++ b/src/cmd/compile/internal/ssa/check.go
@@ -294,6 +294,26 @@
}
}
}
+
+ // Check use counts
+ uses := make([]int32, f.NumValues())
+ for _, b := range f.Blocks {
+ for _, v := range b.Values {
+ for _, a := range v.Args {
+ uses[a.ID]++
+ }
+ }
+ if b.Control != nil {
+ uses[b.Control.ID]++
+ }
+ }
+ for _, b := range f.Blocks {
+ for _, v := range b.Values {
+ if v.Uses != uses[v.ID] {
+ f.Fatalf("%s has %d uses, but has Uses=%d", v, uses[v.ID], v.Uses)
+ }
+ }
+ }
}
// domCheck reports whether x dominates y (including x==y).
diff --git a/src/cmd/compile/internal/ssa/copyelim.go b/src/cmd/compile/internal/ssa/copyelim.go
index 5488134..70db03c 100644
--- a/src/cmd/compile/internal/ssa/copyelim.go
+++ b/src/cmd/compile/internal/ssa/copyelim.go
@@ -11,11 +11,11 @@
copyelimValue(v)
}
v := b.Control
- if v != nil {
+ if v != nil && v.Op == OpCopy {
for v.Op == OpCopy {
v = v.Args[0]
}
- b.Control = v
+ b.SetControl(v)
}
}
@@ -34,8 +34,9 @@
}
}
-func copyelimValue(v *Value) {
+func copyelimValue(v *Value) bool {
// elide any copies generated during rewriting
+ changed := false
for i, a := range v.Args {
if a.Op != OpCopy {
continue
@@ -55,6 +56,8 @@
}
advance = !advance
}
- v.Args[i] = a
+ v.SetArg(i, a)
+ changed = true
}
+ return changed
}
diff --git a/src/cmd/compile/internal/ssa/cse.go b/src/cmd/compile/internal/ssa/cse.go
index 817ee4b..1ec5712 100644
--- a/src/cmd/compile/internal/ssa/cse.go
+++ b/src/cmd/compile/internal/ssa/cse.go
@@ -182,7 +182,7 @@
// them appropriately, so don't mess with them here.
continue
}
- b.Control = x
+ b.SetControl(x)
}
}
}
diff --git a/src/cmd/compile/internal/ssa/deadcode.go b/src/cmd/compile/internal/ssa/deadcode.go
index 819f6de..ae99002 100644
--- a/src/cmd/compile/internal/ssa/deadcode.go
+++ b/src/cmd/compile/internal/ssa/deadcode.go
@@ -164,6 +164,18 @@
}
f.Names = f.Names[:i]
+ // Unlink values.
+ for _, b := range f.Blocks {
+ if !reachable[b.ID] {
+ b.SetControl(nil)
+ }
+ for _, v := range b.Values {
+ if !live[v.ID] {
+ v.resetArgs()
+ }
+ }
+ }
+
// Remove dead values from blocks' value list. Return dead
// values to the allocator.
for _, b := range f.Blocks {
@@ -231,6 +243,7 @@
if v.Op != OpPhi {
continue
}
+ v.Args[i].Uses--
v.Args[i] = v.Args[n]
v.Args[n] = nil // aid GC
v.Args = v.Args[:n]
diff --git a/src/cmd/compile/internal/ssa/flagalloc.go b/src/cmd/compile/internal/ssa/flagalloc.go
index b3aa62c..6f20bea 100644
--- a/src/cmd/compile/internal/ssa/flagalloc.go
+++ b/src/cmd/compile/internal/ssa/flagalloc.go
@@ -113,7 +113,7 @@
if v := b.Control; v != nil && v != flag && v.Type.IsFlags() {
// Recalculate control value.
c := v.copyInto(b)
- b.Control = c
+ b.SetControl(c)
flag = v
}
if v := end[b.ID]; v != nil && v != flag {
diff --git a/src/cmd/compile/internal/ssa/func.go b/src/cmd/compile/internal/ssa/func.go
index d7a48fe..6e47b7f 100644
--- a/src/cmd/compile/internal/ssa/func.go
+++ b/src/cmd/compile/internal/ssa/func.go
@@ -114,6 +114,9 @@
if v.Block == nil {
f.Fatalf("trying to free an already freed value")
}
+ if v.Uses != 0 {
+ f.Fatalf("value %s still has %d uses", v, v.Uses)
+ }
// Clear everything but ID (which we reuse).
id := v.ID
@@ -217,6 +220,7 @@
v.AuxInt = 0
v.Args = v.argstorage[:1]
v.argstorage[0] = arg
+ arg.Uses++
return v
}
@@ -226,6 +230,7 @@
v.AuxInt = auxint
v.Args = v.argstorage[:1]
v.argstorage[0] = arg
+ arg.Uses++
return v
}
@@ -236,6 +241,7 @@
v.Aux = aux
v.Args = v.argstorage[:1]
v.argstorage[0] = arg
+ arg.Uses++
return v
}
@@ -246,6 +252,7 @@
v.Aux = aux
v.Args = v.argstorage[:1]
v.argstorage[0] = arg
+ arg.Uses++
return v
}
@@ -256,6 +263,8 @@
v.Args = v.argstorage[:2]
v.argstorage[0] = arg0
v.argstorage[1] = arg1
+ arg0.Uses++
+ arg1.Uses++
return v
}
@@ -266,6 +275,8 @@
v.Args = v.argstorage[:2]
v.argstorage[0] = arg0
v.argstorage[1] = arg1
+ arg0.Uses++
+ arg1.Uses++
return v
}
@@ -274,6 +285,9 @@
v := b.Func.newValue(op, t, b, line)
v.AuxInt = 0
v.Args = []*Value{arg0, arg1, arg2}
+ arg0.Uses++
+ arg1.Uses++
+ arg2.Uses++
return v
}
@@ -282,6 +296,9 @@
v := b.Func.newValue(op, t, b, line)
v.AuxInt = auxint
v.Args = []*Value{arg0, arg1, arg2}
+ arg0.Uses++
+ arg1.Uses++
+ arg2.Uses++
return v
}
diff --git a/src/cmd/compile/internal/ssa/func_test.go b/src/cmd/compile/internal/ssa/func_test.go
index 4fef782..ddb9ccb 100644
--- a/src/cmd/compile/internal/ssa/func_test.go
+++ b/src/cmd/compile/internal/ssa/func_test.go
@@ -168,7 +168,7 @@
if !ok {
f.Fatalf("control value for block %s missing", bloc.name)
}
- b.Control = cval
+ b.SetControl(cval)
}
// Fill in args.
for _, valu := range bloc.valus {
diff --git a/src/cmd/compile/internal/ssa/fuse.go b/src/cmd/compile/internal/ssa/fuse.go
index 3f81e45..1f826cd 100644
--- a/src/cmd/compile/internal/ssa/fuse.go
+++ b/src/cmd/compile/internal/ssa/fuse.go
@@ -96,7 +96,7 @@
ss.removePred(s1)
}
b.Kind = BlockPlain
- b.Control = nil
+ b.SetControl(nil)
b.Succs = append(b.Succs[:0], ss)
// Trash the empty blocks s0 & s1.
diff --git a/src/cmd/compile/internal/ssa/gen/AMD64.rules b/src/cmd/compile/internal/ssa/gen/AMD64.rules
index b720be7..b975358 100644
--- a/src/cmd/compile/internal/ssa/gen/AMD64.rules
+++ b/src/cmd/compile/internal/ssa/gen/AMD64.rules
@@ -602,12 +602,15 @@
// as the original load. If not, we end up making a value with
// memory type live in two different blocks, which can lead to
// multiple memory values alive simultaneously.
-(MOVBQSX (MOVBload [off] {sym} ptr mem)) -> @v.Args[0].Block (MOVBQSXload <v.Type> [off] {sym} ptr mem)
-(MOVBQZX (MOVBload [off] {sym} ptr mem)) -> @v.Args[0].Block (MOVBQZXload <v.Type> [off] {sym} ptr mem)
-(MOVWQSX (MOVWload [off] {sym} ptr mem)) -> @v.Args[0].Block (MOVWQSXload <v.Type> [off] {sym} ptr mem)
-(MOVWQZX (MOVWload [off] {sym} ptr mem)) -> @v.Args[0].Block (MOVWQZXload <v.Type> [off] {sym} ptr mem)
-(MOVLQSX (MOVLload [off] {sym} ptr mem)) -> @v.Args[0].Block (MOVLQSXload <v.Type> [off] {sym} ptr mem)
-(MOVLQZX (MOVLload [off] {sym} ptr mem)) -> @v.Args[0].Block (MOVLQZXload <v.Type> [off] {sym} ptr mem)
+// Make sure we don't combine these ops if the load has another use.
+// This prevents a single load from being split into multiple loads
+// which then might return different values. See test/atomicload.go.
+(MOVBQSX (MOVBload [off] {sym} ptr mem)) && v.Args[0].Uses == 1 -> @v.Args[0].Block (MOVBQSXload <v.Type> [off] {sym} ptr mem)
+(MOVBQZX (MOVBload [off] {sym} ptr mem)) && v.Args[0].Uses == 1 -> @v.Args[0].Block (MOVBQZXload <v.Type> [off] {sym} ptr mem)
+(MOVWQSX (MOVWload [off] {sym} ptr mem)) && v.Args[0].Uses == 1 -> @v.Args[0].Block (MOVWQSXload <v.Type> [off] {sym} ptr mem)
+(MOVWQZX (MOVWload [off] {sym} ptr mem)) && v.Args[0].Uses == 1 -> @v.Args[0].Block (MOVWQZXload <v.Type> [off] {sym} ptr mem)
+(MOVLQSX (MOVLload [off] {sym} ptr mem)) && v.Args[0].Uses == 1 -> @v.Args[0].Block (MOVLQSXload <v.Type> [off] {sym} ptr mem)
+(MOVLQZX (MOVLload [off] {sym} ptr mem)) && v.Args[0].Uses == 1 -> @v.Args[0].Block (MOVLQZXload <v.Type> [off] {sym} ptr mem)
// replace load from same location as preceding store with copy
(MOVBload [off] {sym} ptr (MOVBstore [off2] {sym2} ptr2 x _)) && sym == sym2 && off == off2 && isSamePtr(ptr, ptr2) -> x
diff --git a/src/cmd/compile/internal/ssa/gen/rulegen.go b/src/cmd/compile/internal/ssa/gen/rulegen.go
index 9cb44f4..68e2dbf 100644
--- a/src/cmd/compile/internal/ssa/gen/rulegen.go
+++ b/src/cmd/compile/internal/ssa/gen/rulegen.go
@@ -258,9 +258,9 @@
fmt.Fprintf(w, "b.Kind = %s\n", blockName(t[0], arch))
if t[1] == "nil" {
- fmt.Fprintf(w, "b.Control = nil\n")
+ fmt.Fprintf(w, "b.SetControl(nil)\n")
} else {
- fmt.Fprintf(w, "b.Control = %s\n", genResult0(w, arch, t[1], new(int), false, false))
+ fmt.Fprintf(w, "b.SetControl(%s)\n", genResult0(w, arch, t[1], new(int), false, false))
}
if len(newsuccs) < len(succs) {
fmt.Fprintf(w, "b.Succs = b.Succs[:%d]\n", len(newsuccs))
@@ -486,7 +486,7 @@
v = fmt.Sprintf("v%d", *alloc)
*alloc++
fmt.Fprintf(w, "%s := b.NewValue0(v.Line, %s, %s)\n", v, opName(s[0], arch), opType)
- if move {
+ if move && top {
// Rewrite original into a copy
fmt.Fprintf(w, "v.reset(OpCopy)\n")
fmt.Fprintf(w, "v.AddArg(%s)\n", v)
diff --git a/src/cmd/compile/internal/ssa/nilcheck.go b/src/cmd/compile/internal/ssa/nilcheck.go
index 4e40c5b..881e3b2 100644
--- a/src/cmd/compile/internal/ssa/nilcheck.go
+++ b/src/cmd/compile/internal/ssa/nilcheck.go
@@ -98,10 +98,10 @@
switch node.block.Kind {
case BlockIf:
node.block.Kind = BlockFirst
- node.block.Control = nil
+ node.block.SetControl(nil)
case BlockCheck:
node.block.Kind = BlockPlain
- node.block.Control = nil
+ node.block.SetControl(nil)
default:
f.Fatalf("bad block kind in nilcheck %s", node.block.Kind)
}
diff --git a/src/cmd/compile/internal/ssa/prove.go b/src/cmd/compile/internal/ssa/prove.go
index bb20f1d..f09a3c5e0 100644
--- a/src/cmd/compile/internal/ssa/prove.go
+++ b/src/cmd/compile/internal/ssa/prove.go
@@ -307,7 +307,7 @@
if succ != unknown {
b := node.block
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
if succ == negative {
b.Succs[0], b.Succs[1] = b.Succs[1], b.Succs[0]
}
diff --git a/src/cmd/compile/internal/ssa/regalloc.go b/src/cmd/compile/internal/ssa/regalloc.go
index 8652847..8a5e438 100644
--- a/src/cmd/compile/internal/ssa/regalloc.go
+++ b/src/cmd/compile/internal/ssa/regalloc.go
@@ -897,6 +897,9 @@
// Value is rematerializeable, don't issue it here.
// It will get issued just before each use (see
// allocValueToReg).
+ for _, a := range v.Args {
+ a.Uses--
+ }
s.advanceUses(v)
continue
}
@@ -949,7 +952,7 @@
// Issue the Value itself.
for i, a := range args {
- v.Args[i] = a // use register version of arguments
+ v.SetArg(i, a) // use register version of arguments
}
b.Values = append(b.Values, v)
@@ -1123,6 +1126,7 @@
// Constants, SP, SB, ...
continue
}
+ spill.Args[0].Uses--
f.freeValue(spill)
}
for _, b := range f.Blocks {
@@ -1333,7 +1337,9 @@
// Value is already in the correct place.
e.contents[loc] = contentRecord{vid, occupant.c, true}
if splice != nil {
+ (*splice).Uses--
*splice = occupant.c
+ occupant.c.Uses++
}
// Note: if splice==nil then c will appear dead. This is
// non-SSA formed code, so be careful after this pass not to run
@@ -1430,7 +1436,9 @@
}
e.set(loc, vid, x, true)
if splice != nil {
+ (*splice).Uses--
*splice = x
+ x.Uses++
}
return true
}
diff --git a/src/cmd/compile/internal/ssa/rewrite.go b/src/cmd/compile/internal/ssa/rewrite.go
index 8581b7d..fc2cd4c 100644
--- a/src/cmd/compile/internal/ssa/rewrite.go
+++ b/src/cmd/compile/internal/ssa/rewrite.go
@@ -31,7 +31,7 @@
}
if b.Control != nil && b.Control.Op == OpCopy {
for b.Control.Op == OpCopy {
- b.Control = b.Control.Args[0]
+ b.SetControl(b.Control.Args[0])
}
}
curb = b
@@ -40,7 +40,7 @@
}
curb = nil
for _, v := range b.Values {
- copyelimValue(v)
+ change = copyelimValue(v) || change
change = phielimValue(v) || change
// apply rewrite function
diff --git a/src/cmd/compile/internal/ssa/rewriteAMD64.go b/src/cmd/compile/internal/ssa/rewriteAMD64.go
index fe452f7..9b4e638 100644
--- a/src/cmd/compile/internal/ssa/rewriteAMD64.go
+++ b/src/cmd/compile/internal/ssa/rewriteAMD64.go
@@ -5390,7 +5390,7 @@
b := v.Block
_ = b
// match: (MOVBQSX (MOVBload [off] {sym} ptr mem))
- // cond:
+ // cond: v.Args[0].Uses == 1
// result: @v.Args[0].Block (MOVBQSXload <v.Type> [off] {sym} ptr mem)
for {
if v.Args[0].Op != OpAMD64MOVBload {
@@ -5400,6 +5400,9 @@
sym := v.Args[0].Aux
ptr := v.Args[0].Args[0]
mem := v.Args[0].Args[1]
+ if !(v.Args[0].Uses == 1) {
+ break
+ }
b = v.Args[0].Block
v0 := b.NewValue0(v.Line, OpAMD64MOVBQSXload, v.Type)
v.reset(OpCopy)
@@ -5461,7 +5464,7 @@
b := v.Block
_ = b
// match: (MOVBQZX (MOVBload [off] {sym} ptr mem))
- // cond:
+ // cond: v.Args[0].Uses == 1
// result: @v.Args[0].Block (MOVBQZXload <v.Type> [off] {sym} ptr mem)
for {
if v.Args[0].Op != OpAMD64MOVBload {
@@ -5471,6 +5474,9 @@
sym := v.Args[0].Aux
ptr := v.Args[0].Args[0]
mem := v.Args[0].Args[1]
+ if !(v.Args[0].Uses == 1) {
+ break
+ }
b = v.Args[0].Block
v0 := b.NewValue0(v.Line, OpAMD64MOVBQZXload, v.Type)
v.reset(OpCopy)
@@ -6051,7 +6057,7 @@
b := v.Block
_ = b
// match: (MOVLQSX (MOVLload [off] {sym} ptr mem))
- // cond:
+ // cond: v.Args[0].Uses == 1
// result: @v.Args[0].Block (MOVLQSXload <v.Type> [off] {sym} ptr mem)
for {
if v.Args[0].Op != OpAMD64MOVLload {
@@ -6061,6 +6067,9 @@
sym := v.Args[0].Aux
ptr := v.Args[0].Args[0]
mem := v.Args[0].Args[1]
+ if !(v.Args[0].Uses == 1) {
+ break
+ }
b = v.Args[0].Block
v0 := b.NewValue0(v.Line, OpAMD64MOVLQSXload, v.Type)
v.reset(OpCopy)
@@ -6122,7 +6131,7 @@
b := v.Block
_ = b
// match: (MOVLQZX (MOVLload [off] {sym} ptr mem))
- // cond:
+ // cond: v.Args[0].Uses == 1
// result: @v.Args[0].Block (MOVLQZXload <v.Type> [off] {sym} ptr mem)
for {
if v.Args[0].Op != OpAMD64MOVLload {
@@ -6132,6 +6141,9 @@
sym := v.Args[0].Aux
ptr := v.Args[0].Args[0]
mem := v.Args[0].Args[1]
+ if !(v.Args[0].Uses == 1) {
+ break
+ }
b = v.Args[0].Block
v0 := b.NewValue0(v.Line, OpAMD64MOVLQZXload, v.Type)
v.reset(OpCopy)
@@ -7652,7 +7664,7 @@
b := v.Block
_ = b
// match: (MOVWQSX (MOVWload [off] {sym} ptr mem))
- // cond:
+ // cond: v.Args[0].Uses == 1
// result: @v.Args[0].Block (MOVWQSXload <v.Type> [off] {sym} ptr mem)
for {
if v.Args[0].Op != OpAMD64MOVWload {
@@ -7662,6 +7674,9 @@
sym := v.Args[0].Aux
ptr := v.Args[0].Args[0]
mem := v.Args[0].Args[1]
+ if !(v.Args[0].Uses == 1) {
+ break
+ }
b = v.Args[0].Block
v0 := b.NewValue0(v.Line, OpAMD64MOVWQSXload, v.Type)
v.reset(OpCopy)
@@ -7723,7 +7738,7 @@
b := v.Block
_ = b
// match: (MOVWQZX (MOVWload [off] {sym} ptr mem))
- // cond:
+ // cond: v.Args[0].Uses == 1
// result: @v.Args[0].Block (MOVWQZXload <v.Type> [off] {sym} ptr mem)
for {
if v.Args[0].Op != OpAMD64MOVWload {
@@ -7733,6 +7748,9 @@
sym := v.Args[0].Aux
ptr := v.Args[0].Args[0]
mem := v.Args[0].Args[1]
+ if !(v.Args[0].Uses == 1) {
+ break
+ }
b = v.Args[0].Block
v0 := b.NewValue0(v.Line, OpAMD64MOVWQZXload, v.Type)
v.reset(OpCopy)
@@ -14375,7 +14393,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64EQ
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14391,7 +14409,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14407,7 +14425,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -14424,7 +14442,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -14441,7 +14459,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -14458,7 +14476,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -14477,7 +14495,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64LE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14493,7 +14511,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14509,7 +14527,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -14526,7 +14544,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -14543,7 +14561,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14559,7 +14577,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14577,7 +14595,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64LT
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14593,7 +14611,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -14610,7 +14628,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -14627,7 +14645,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -14644,7 +14662,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14660,7 +14678,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14678,7 +14696,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64LT
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14695,7 +14713,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64LE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14712,7 +14730,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64GT
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14729,7 +14747,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64GE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14746,7 +14764,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64EQ
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14763,7 +14781,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64NE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14780,7 +14798,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64ULT
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14797,7 +14815,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64ULE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14814,7 +14832,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64UGT
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14831,7 +14849,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64UGE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14848,7 +14866,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64UGT
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14865,7 +14883,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64UGE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14882,7 +14900,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64EQF
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14899,7 +14917,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64NEF
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14916,7 +14934,7 @@
v0 := b.NewValue0(v.Line, OpAMD64TESTB, TypeFlags)
v0.AddArg(cond)
v0.AddArg(cond)
- b.Control = v0
+ b.SetControl(v0)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14934,7 +14952,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64GE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14950,7 +14968,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14966,7 +14984,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14982,7 +15000,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -14998,7 +15016,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15015,7 +15033,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15034,7 +15052,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64GT
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15050,7 +15068,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15067,7 +15085,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15083,7 +15101,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15099,7 +15117,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15116,7 +15134,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15138,7 +15156,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64LT
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15158,7 +15176,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64LE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15178,7 +15196,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64GT
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15198,7 +15216,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64GE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15218,7 +15236,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64EQ
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15238,7 +15256,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64NE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15258,7 +15276,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64ULT
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15278,7 +15296,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64ULE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15298,7 +15316,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64UGT
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15318,7 +15336,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64UGE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15338,7 +15356,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64UGT
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15358,7 +15376,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64UGE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15378,7 +15396,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64EQF
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15398,7 +15416,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64NEF
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15415,7 +15433,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64NE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15431,7 +15449,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15448,7 +15466,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15464,7 +15482,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15480,7 +15498,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15496,7 +15514,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15514,7 +15532,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64ULE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15530,7 +15548,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15546,7 +15564,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15563,7 +15581,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15579,7 +15597,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15596,7 +15614,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15614,7 +15632,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64ULT
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15630,7 +15648,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15647,7 +15665,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15664,7 +15682,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15680,7 +15698,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15697,7 +15715,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15715,7 +15733,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64UGE
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15731,7 +15749,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15747,7 +15765,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15763,7 +15781,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15780,7 +15798,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15796,7 +15814,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15815,7 +15833,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockAMD64UGT
- b.Control = cmp
+ b.SetControl(cmp)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15831,7 +15849,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15848,7 +15866,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15864,7 +15882,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -15881,7 +15899,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -15897,7 +15915,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
diff --git a/src/cmd/compile/internal/ssa/rewritegeneric.go b/src/cmd/compile/internal/ssa/rewritegeneric.go
index 4ed4cbf..bf08dd1 100644
--- a/src/cmd/compile/internal/ssa/rewritegeneric.go
+++ b/src/cmd/compile/internal/ssa/rewritegeneric.go
@@ -7798,8 +7798,6 @@
v.reset(OpCopy)
v.AddArg(v0)
v1 := b.NewValue0(v.Line, OpOffPtr, v.Type.PtrTo())
- v.reset(OpCopy)
- v.AddArg(v1)
v1.AuxInt = t.FieldOff(int(i))
v1.AddArg(ptr)
v0.AddArg(v1)
@@ -8642,7 +8640,7 @@
}
next := b.Succs[0]
b.Kind = BlockPlain
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = next
b.Likely = BranchUnknown
return true
@@ -8660,7 +8658,7 @@
yes := b.Succs[0]
no := b.Succs[1]
b.Kind = BlockIf
- b.Control = cond
+ b.SetControl(cond)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
@@ -8681,7 +8679,7 @@
break
}
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = yes
b.Succs[1] = no
return true
@@ -8701,7 +8699,7 @@
break
}
b.Kind = BlockFirst
- b.Control = nil
+ b.SetControl(nil)
b.Succs[0] = no
b.Succs[1] = yes
b.Likely *= -1
diff --git a/src/cmd/compile/internal/ssa/shortcircuit.go b/src/cmd/compile/internal/ssa/shortcircuit.go
index d22a61a..f589b7a 100644
--- a/src/cmd/compile/internal/ssa/shortcircuit.go
+++ b/src/cmd/compile/internal/ssa/shortcircuit.go
@@ -36,9 +36,9 @@
continue
}
if p.Succs[0] == b {
- v.Args[i] = ct
+ v.SetArg(i, ct)
} else {
- v.Args[i] = cf
+ v.SetArg(i, cf)
}
}
}
@@ -111,7 +111,7 @@
if w.Op != OpPhi {
continue
}
- w.Args = append(w.Args, w.Args[j])
+ w.AddArg(w.Args[j])
}
// Fix up b to have one less predecessor.
@@ -119,6 +119,7 @@
b.Preds[i] = b.Preds[n]
b.Preds[n] = nil
b.Preds = b.Preds[:n]
+ v.Args[i].Uses--
v.Args[i] = v.Args[n]
v.Args[n] = nil
v.Args = v.Args[:n]
diff --git a/src/cmd/compile/internal/ssa/sizeof_test.go b/src/cmd/compile/internal/ssa/sizeof_test.go
index 8b79ecf..11b46ca 100644
--- a/src/cmd/compile/internal/ssa/sizeof_test.go
+++ b/src/cmd/compile/internal/ssa/sizeof_test.go
@@ -22,7 +22,7 @@
_32bit uintptr // size on 32bit platforms
_64bit uintptr // size on 64bit platforms
}{
- {Value{}, 64, 112},
+ {Value{}, 68, 112},
{Block{}, 124, 232},
}
diff --git a/src/cmd/compile/internal/ssa/value.go b/src/cmd/compile/internal/ssa/value.go
index e3510b1..0e71326 100644
--- a/src/cmd/compile/internal/ssa/value.go
+++ b/src/cmd/compile/internal/ssa/value.go
@@ -38,6 +38,9 @@
// Source line number
Line int32
+ // Use count. Each appearance in Value.Args and Block.Control counts once.
+ Uses int32
+
// Storage for the first three args
argstorage [3]*Value
}
@@ -162,17 +165,24 @@
v.resetArgs() // use argstorage
}
v.Args = append(v.Args, w)
+ w.Uses++
}
func (v *Value) AddArgs(a ...*Value) {
if v.Args == nil {
v.resetArgs() // use argstorage
}
v.Args = append(v.Args, a...)
+ for _, x := range a {
+ x.Uses++
+ }
}
func (v *Value) SetArg(i int, w *Value) {
+ v.Args[i].Uses--
v.Args[i] = w
+ w.Uses++
}
func (v *Value) RemoveArg(i int) {
+ v.Args[i].Uses--
copy(v.Args[i:], v.Args[i+1:])
v.Args[len(v.Args)-1] = nil // aid GC
v.Args = v.Args[:len(v.Args)-1]
@@ -188,6 +198,9 @@
}
func (v *Value) resetArgs() {
+ for _, a := range v.Args {
+ a.Uses--
+ }
v.argstorage[0] = nil
v.argstorage[1] = nil
v.Args = v.argstorage[:0]
diff --git a/src/cmd/compile/internal/ssa/zcse.go b/src/cmd/compile/internal/ssa/zcse.go
index 664fbae..dbda53e 100644
--- a/src/cmd/compile/internal/ssa/zcse.go
+++ b/src/cmd/compile/internal/ssa/zcse.go
@@ -48,7 +48,7 @@
if opcodeTable[a.Op].argLen == 0 {
key := vkey{a.Op, keyFor(a), a.Aux, typeStr(a)}
if rv, ok := vals[key]; ok {
- v.Args[i] = rv
+ v.SetArg(i, rv)
}
}
}
