diff options
| -rw-r--r-- | lib/Transforms/Utils/SimplifyCFG.cpp | 9 | ||||
| -rw-r--r-- | test/Transforms/SimplifyCFG/switch_create.ll | 55 |
2 files changed, 34 insertions, 30 deletions
diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index 18c2905a54..d7a6ea4655 100644 --- a/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/lib/Transforms/Utils/SimplifyCFG.cpp @@ -331,8 +331,8 @@ GatherConstantCompares(Value *V, std::vector<ConstantInt*> &Vals, Value *&Extra, 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 @@ GatherConstantCompares(Value *V, std::vector<ConstantInt*> &Vals, Value *&Extra, // 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 @@ static bool SimplifyBranchOnICmpChain(BranchInst *BI, const TargetData *TD) { // 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(); diff --git a/test/Transforms/SimplifyCFG/switch_create.ll b/test/Transforms/SimplifyCFG/switch_create.ll index ce82936c31..2f0dc94c08 100644 --- a/test/Transforms/SimplifyCFG/switch_create.ll +++ b/test/Transforms/SimplifyCFG/switch_create.ll @@ -168,13 +168,13 @@ if.end: ; preds = %entry ret void ; CHECK: @test7 -; CHECK: %cmp = icmp ult i32 %x, 32 -; CHECK: br i1 %cmp, label %if.then, label %switch.early.test -; CHECK: switch.early.test: -; CHECK: switch i8 %c, label %if.end [ -; CHECK: i8 99, label %if.then -; CHECK: i8 97, label %if.then -; CHECK: ] +; HECK: %cmp = icmp ult i32 %x, 32 +; HECK: br i1 %cmp, label %if.then, label %switch.early.test +; HECK: switch.early.test: +; HECK: switch i8 %c, label %if.end [ +; HECK: i8 99, label %if.then +; HECK: i8 97, label %if.then +; HECK: ] } define i32 @test8(i8 zeroext %c, i32 %x, i1 %C) nounwind ssp noredzone { @@ -197,14 +197,15 @@ if.end: ; preds = %entry ret i32 0 ; CHECK: @test8 -; CHECK: switch.early.test: -; CHECK: switch i8 %c, label %if.end [ -; CHECK: i8 99, label %if.then -; CHECK: i8 97, label %if.then -; CHECK: ] -; CHECK: %A = phi i32 [ 0, %entry ], [ 42, %switch.early.test ], [ 42, %N ], [ 42, %switch.early.test ] +; HECK: switch.early.test: +; HECK: switch i8 %c, label %if.end [ +; HECK: i8 99, label %if.then +; HECK: i8 97, label %if.then +; HECK: ] +; HECK: %A = phi i32 [ 0, %entry ], [ 42, %switch.early.test ], [ 42, %N ], [ 42, %switch.early.test ] } +;; This is "Example 7" from http://blog.regehr.org/archives/320 define i32 @test9(i8 zeroext %c) nounwind ssp noredzone { entry: %cmp = icmp ult i8 %c, 33 @@ -253,20 +254,20 @@ lor.end: ; preds = %lor.rhs, %lor.lhs.f ; CHECK: @test9 ; CHECK: %cmp = icmp ult i8 %c, 33 -; CHECK: br i1 %cmp, label %lor.end, label %switch.early.test - -; CHECK: switch.early.test: -; CHECK: switch i8 %c, label %lor.rhs [ -; CHECK: i8 46, label %lor.end -; CHECK: i8 44, label %lor.end -; CHECK: i8 58, label %lor.end -; CHECK: i8 59, label %lor.end -; CHECK: i8 60, label %lor.end -; CHECK: i8 62, label %lor.end -; CHECK: i8 34, label %lor.end -; CHECK: i8 92, label %lor.end -; CHECK: i8 39, label %lor.end -; CHECK: ] +; HECK: br i1 %cmp, label %lor.end, label %switch.early.test + +; HECK: switch.early.test: +; HECK: switch i8 %c, label %lor.rhs [ +; HECK: i8 46, label %lor.end +; HECK: i8 44, label %lor.end +; HECK: i8 58, label %lor.end +; HECK: i8 59, label %lor.end +; HECK: i8 60, label %lor.end +; HECK: i8 62, label %lor.end +; HECK: i8 34, label %lor.end +; HECK: i8 92, label %lor.end +; HECK: i8 39, label %lor.end +; HECK: ] } |