Completely disable the optimization I added in r121680 until
I can track down a miscompile. This should bring the buildbots
back to life
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121693 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp
index 18c2905..d7a6ea4 100644
--- a/lib/Transforms/Utils/SimplifyCFG.cpp
+++ b/lib/Transforms/Utils/SimplifyCFG.cpp
@@ -331,8 +331,8 @@
isEQ)) {
if (LHS == RHS)
return LHS;
+ Vals.resize(NumVals);
}
- Vals.resize(NumVals);
// The RHS of the or/and can't be folded in and we haven't used "Extra" yet,
// set it and return success.
@@ -348,12 +348,13 @@
// If the LHS can't be folded in, but Extra is available and RHS can, try to
// use LHS as Extra.
if (Extra == 0 || Extra == I->getOperand(0)) {
+ Value *OldExtra = Extra;
Extra = I->getOperand(0);
if (Value *RHS = GatherConstantCompares(I->getOperand(1), Vals, Extra, TD,
isEQ))
return RHS;
- Vals.resize(NumValsBeforeLHS);
- Extra = 0;
+ assert(Vals.size() == NumValsBeforeLHS);
+ Extra = OldExtra;
}
return 0;
@@ -1908,6 +1909,8 @@
// then we evaluate them with an explicit branch first. Split the block
// right before the condbr to handle it.
if (ExtraCase) {
+ return false;
+
BasicBlock *NewBB = BB->splitBasicBlock(BI, "switch.early.test");
// Remove the uncond branch added to the old block.
TerminatorInst *OldTI = BB->getTerminator();