diff options
author | Dan Scales <danscales@google.com> | 2019-11-01 14:04:08 -0700 |
---|---|---|
committer | Dan Scales <danscales@google.com> | 2019-11-05 17:19:16 +0000 |
commit | 1b3a1db19fc68591198149540f7b3c99f56691da (patch) | |
tree | c7829cb7cc4d46c253a346b39cf6910b17815038 /src/cmd/compile/internal/ssa/phiopt.go | |
parent | 414c1d454e6d388443239209220fe0783d4dac71 (diff) | |
download | go-1b3a1db19fc68591198149540f7b3c99f56691da.tar.gz go-1b3a1db19fc68591198149540f7b3c99f56691da.zip |
cmd/compile: fix liveness for open-coded defer args for infinite loops
Once defined, a stack slot holding an open-coded defer arg should always be marked
live, since it may be used at any time if there is a panic. These stack slots are
typically kept live naturally by the open-defer code inlined at each return/exit point.
However, we need to do extra work to make sure that they are kept live if a
function has an infinite loop or a panic exit.
For this fix, only in the case of a function that is using open-coded defers, we
compute the set of blocks (most often empty) that cannot reach a return or a
BlockExit (panic) because of an infinite loop. Then, for each block b which
cannot reach a return or BlockExit or is a BlockExit block, we mark each defer arg
slot as live, as long as the definition of the defer arg slot dominates block b.
For this change, had to export (*Func).sdom (-> Sdom) and SparseTree.isAncestorEq
(-> IsAncestorEq)
Updates #35277
Change-Id: I7b53c9bd38ba384a3794386dd0eb94e4cbde4eb1
Reviewed-on: https://go-review.googlesource.com/c/go/+/204802
Run-TryBot: Dan Scales <danscales@google.com>
TryBot-Result: Gobot Gobot <gobot@golang.org>
Reviewed-by: Keith Randall <khr@golang.org>
Diffstat (limited to 'src/cmd/compile/internal/ssa/phiopt.go')
-rw-r--r-- | src/cmd/compile/internal/ssa/phiopt.go | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/cmd/compile/internal/ssa/phiopt.go b/src/cmd/compile/internal/ssa/phiopt.go index 1840d6d54e..cc3319e188 100644 --- a/src/cmd/compile/internal/ssa/phiopt.go +++ b/src/cmd/compile/internal/ssa/phiopt.go @@ -24,7 +24,7 @@ package ssa // // In this case we can replace x with a copy of b. func phiopt(f *Func) { - sdom := f.sdom() + sdom := f.Sdom() for _, b := range f.Blocks { if len(b.Preds) != 2 || len(b.Values) == 0 { // TODO: handle more than 2 predecessors, e.g. a || b || c. @@ -93,7 +93,7 @@ func phiopt(f *Func) { // value is always computed. This guarantees that the side effects // of value are not seen if a is false. if v.Args[reverse].Op == OpConstBool && v.Args[reverse].AuxInt == 1 { - if tmp := v.Args[1-reverse]; sdom.isAncestorEq(tmp.Block, b) { + if tmp := v.Args[1-reverse]; sdom.IsAncestorEq(tmp.Block, b) { v.reset(OpOrB) v.SetArgs2(b0.Controls[0], tmp) if f.pass.debug > 0 { @@ -109,7 +109,7 @@ func phiopt(f *Func) { // value is always computed. This guarantees that the side effects // of value are not seen if a is false. if v.Args[1-reverse].Op == OpConstBool && v.Args[1-reverse].AuxInt == 0 { - if tmp := v.Args[reverse]; sdom.isAncestorEq(tmp.Block, b) { + if tmp := v.Args[reverse]; sdom.IsAncestorEq(tmp.Block, b) { v.reset(OpAndB) v.SetArgs2(b0.Controls[0], tmp) if f.pass.debug > 0 { |