cmd/compile: remove go115shortcircuitPhis

Change-Id: Ib2697ebfcc14a01ab1f793cddcbf69180ffc49a2
Reviewed-on: https://go-review.googlesource.com/c/go/+/264341
Trust: Cherry Zhang <cherryyz@google.com>
Reviewed-by: Keith Randall <khr@golang.org>

diff --git a/src/cmd/compile/internal/ssa/shortcircuit.go b/src/cmd/compile/internal/ssa/shortcircuit.go
index c5df457c4e2e7ce1f4f10262ff89d25143564182..7b4ee2e81c297a0306f6834f1f7b4d379ca05f70 100644 (file)
--- a/src/cmd/compile/internal/ssa/shortcircuit.go
+++ b/src/cmd/compile/internal/ssa/shortcircuit.go
@@ -261,11 +261,6 @@ func shortcircuitBlock(b *Block) bool {
 // and the CFG modifications must not proceed.
 // The returned function assumes that shortcircuitBlock has completed its CFG modifications.
 func shortcircuitPhiPlan(b *Block, ctl *Value, cidx int, ti int64) func(*Value, int) {
-       const go115shortcircuitPhis = true
-       if !go115shortcircuitPhis {
-               return nil
-       }
-
        // t is the "taken" branch: the successor we always go to when coming in from p.
        t := b.Succs[ti].b
        // u is the "untaken" branch: the successor we never go to when coming in from p.