diff options
| author | Chris Lattner <sabre@nondot.org> | 2010-12-14 07:53:03 +0000 |
|---|---|---|
| committer | Chris Lattner <sabre@nondot.org> | 2010-12-14 07:53:03 +0000 |
| commit | dc20a7d38ca03a222efb0aba12cab4c01abb09ef (patch) | |
| tree | 5328133b7757241e220adecaaac3e38dc248aa6c /llvm/lib/Transforms/Utils | |
| parent | 9ac168d0abf8e40132837e975ba6e9004cae358e (diff) | |
| download | bcm5719-llvm-dc20a7d38ca03a222efb0aba12cab4c01abb09ef.tar.gz bcm5719-llvm-dc20a7d38ca03a222efb0aba12cab4c01abb09ef.zip | |
remove the instsimplify logic I added in r121754. It is apparently
breaking the selfhost builds, though I can't fathom how.
llvm-svn: 121761
Diffstat (limited to 'llvm/lib/Transforms/Utils')
| -rw-r--r-- | llvm/lib/Transforms/Utils/SimplifyCFG.cpp | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp index 288ff0462bc..f0c97fd4a04 100644 --- a/llvm/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/llvm/lib/Transforms/Utils/SimplifyCFG.cpp @@ -1238,17 +1238,7 @@ static bool FoldTwoEntryPHINode(PHINode *PN, const TargetData *TD) { Value *TrueVal = PN->getIncomingValue(PN->getIncomingBlock(0) == IfFalse); Value *FalseVal = PN->getIncomingValue(PN->getIncomingBlock(0) == IfTrue); - Value *NV; - if (Value *V = SimplifySelectInst(IfCond, TrueVal, FalseVal, TD)) - NV = V; - else if (TrueVal->getType()->isIntegerTy(1) && isa<ConstantInt>(TrueVal) && - cast<ConstantInt>(TrueVal)->isOne()) { - if (Value *V = SimplifyOrInst(IfCond, FalseVal, TD)) - NV = V; - else - NV = BinaryOperator::CreateOr(IfCond, FalseVal, "", AfterPHIIt); - } else - NV = SelectInst::Create(IfCond, TrueVal, FalseVal, "", AfterPHIIt); + Value *NV = SelectInst::Create(IfCond, TrueVal, FalseVal, "", AfterPHIIt); PN->replaceAllUsesWith(NV); NV->takeName(PN); PN->eraseFromParent(); |
