Revert "[SimplifyCFG] Add a workaround to fix PR30188"

This reverts commit r280219. r280216 caused buildbot failures - backing out the entire chain.

llvm-svn: 280232

diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
index 3de6c6069a83a45bf53e4fc67da9576d558c32ce..3404a4dfdda538fac36d1460fc77b7e77a266372 100644 (file)
--- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -1424,16 +1424,6 @@ static bool canSinkInstructions(
         // FIXME: if the call was *already* indirect, we should do this.
         return false;
       }
-      // Because SROA can't handle speculating stores of selects, try not
-      // to sink stores of allocas when we'd have to create a PHI for the
-      // address operand.
-      // FIXME: This is a workaround for a deficiency in SROA - see
-      // https://llvm.org/bugs/show_bug.cgi?id=30188
-      if (OI == 1 && isa<StoreInst>(I0) &&
-          any_of(Insts, [](const Instruction *I) {
-            return isa<AllocaInst>(I->getOperand(1));
-          }))
-        return false;
       for (auto *I : Insts)
         PHIOperands[I].push_back(I->getOperand(OI));
     }

diff --git a/llvm/test/Transforms/SimplifyCFG/sink-common-code.ll b/llvm/test/Transforms/SimplifyCFG/sink-common-code.ll
index 9f87d3bf3c5836e297ba8e9e4cbc2bd2b6d6e96c..1a4884a6454540a9c860b273180c79a3ee143779 100644 (file)
--- a/llvm/test/Transforms/SimplifyCFG/sink-common-code.ll
+++ b/llvm/test/Transforms/SimplifyCFG/sink-common-code.ll
@@ -537,29 +537,6 @@ if.end:
 ; CHECK-DAG: [ %cmp3, %if.then3 ]
 ; CHECK-NEXT: zext i1 %[[x]] to i8
 
-define i32 @test_pr30188(i1 zeroext %flag, i32 %x) {
-entry:
-  %y = alloca i32
-  %z = alloca i32
-  br i1 %flag, label %if.then, label %if.else
-
-if.then:
-  store i32 %x, i32* %y
-  br label %if.end
-
-if.else:
-  store i32 %x, i32* %z
-  br label %if.end
-
-if.end:
-  ret i32 1
-}
-
-; CHECK-LABEL: test_pr30188
-; CHECK-NOT: select
-; CHECK: store
-; CHECK: store
-
 ; CHECK: !0 = !{!1, !1, i64 0}
 ; CHECK: !1 = !{!"float", !2}
 ; CHECK: !2 = !{!"an example type tree"}