aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChris Lattner <sabre@nondot.org>2011-01-15 07:51:19 +0000
committerChris Lattner <sabre@nondot.org>2011-01-15 07:51:19 +0000
commit6ccb5ef1b504e71b63219437f5bcf4856207949b (patch)
tree659307653e5f0ec980e873df08eb027d4c81df6c
parenteeba3f5695e39ca970a7aeb161558575216005b2 (diff)
downloadexternal_llvm-6ccb5ef1b504e71b63219437f5bcf4856207949b.zip
external_llvm-6ccb5ef1b504e71b63219437f5bcf4856207949b.tar.gz
external_llvm-6ccb5ef1b504e71b63219437f5bcf4856207949b.tar.bz2
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
-rw-r--r--lib/Transforms/Scalar/CodeGenPrepare.cpp3
-rw-r--r--test/Transforms/CodeGenPrepare/basic.ll4
2 files changed, 3 insertions, 4 deletions
diff --git a/lib/Transforms/Scalar/CodeGenPrepare.cpp b/lib/Transforms/Scalar/CodeGenPrepare.cpp
index 3496aa2..72c8bf3 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<CallInst>(I))
return OptimizeCallInst(CI);
- if (isa<TerminatorInst>(I))
- return ConstantFoldTerminator(I->getParent());
-
return false;
}
diff --git a/test/Transforms/CodeGenPrepare/basic.ll b/test/Transforms/CodeGenPrepare/basic.ll
index a1cdf45..3b1fca3 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