From: Chris Lattner Date: Sat, 15 Jan 2011 07:51:19 +0000 (+0000) Subject: temporarily revert r123526. While working on a follow-on patch I X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6ccb5ef1b504e71b63219437f5bcf4856207949b;p=oota-llvm.git temporarily revert r123526. While working on a follow-on patch I realize that ConstantFoldTerminator doesn't preserve dominfo. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@123527 91177308-0d34-0410-b5e6-96231b3b80d8 --- diff --git a/lib/Transforms/Scalar/CodeGenPrepare.cpp b/lib/Transforms/Scalar/CodeGenPrepare.cpp index 3496aa20abb..72c8bf30477 100644 --- a/lib/Transforms/Scalar/CodeGenPrepare.cpp +++ b/lib/Transforms/Scalar/CodeGenPrepare.cpp @@ -1071,9 +1071,6 @@ bool CodeGenPrepare::OptimizeInst(Instruction *I) { if (CallInst *CI = dyn_cast(I)) return OptimizeCallInst(CI); - if (isa(I)) - return ConstantFoldTerminator(I->getParent()); - return false; } diff --git a/test/Transforms/CodeGenPrepare/basic.ll b/test/Transforms/CodeGenPrepare/basic.ll index a1cdf455536..3b1fca328c5 100644 --- a/test/Transforms/CodeGenPrepare/basic.ll +++ b/test/Transforms/CodeGenPrepare/basic.ll @@ -13,7 +13,9 @@ entry: %1 = icmp ugt i64 %0, 3 br i1 %1, label %T, label %trap -; CHECK: br label %T +; CHECK: entry: +; HECK-NEXT: ret i32 4 + trap: ; preds = %0, %entry tail call void @llvm.trap() noreturn nounwind unreachable