From ea37a65af6ff8c5841f37bef7f9ed2e31808e7cf Mon Sep 17 00:00:00 2001 From: Cherry Zhang Date: Wed, 21 Oct 2020 21:08:39 -0400 Subject: [PATCH] cmd/compile: remove go115shortcircuitPhis Change-Id: Ib2697ebfcc14a01ab1f793cddcbf69180ffc49a2 Reviewed-on: https://go-review.googlesource.com/c/go/+/264341 Trust: Cherry Zhang Reviewed-by: Keith Randall --- src/cmd/compile/internal/ssa/shortcircuit.go | 5 ----- 1 file changed, 5 deletions(-) diff --git a/src/cmd/compile/internal/ssa/shortcircuit.go b/src/cmd/compile/internal/ssa/shortcircuit.go index c5df457c4e..7b4ee2e81c 100644 --- 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. -- 2.52.0