From 071edc81f2a34ff689a2008e327ce7bce3a8edbf Mon Sep 17 00:00:00 2001 From: Chris Lattner Date: Tue, 14 Dec 2010 07:53:03 +0000 Subject: [PATCH] remove the instsimplify logic I added in r121754. It is apparently breaking the selfhost builds, though I can't fathom how. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@121761 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Transforms/Utils/SimplifyCFG.cpp | 12 +----------- 1 file changed, 1 insertion(+), 11 deletions(-) diff --git a/lib/Transforms/Utils/SimplifyCFG.cpp b/lib/Transforms/Utils/SimplifyCFG.cpp index 288ff0462bc..f0c97fd4a04 100644 --- a/lib/Transforms/Utils/SimplifyCFG.cpp +++ b/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(TrueVal) && - cast(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();