[llvm-commits] [llvm] r123527 - in /llvm/trunk: lib/Transforms/Scalar/CodeGenPrepare.cpp test/Transforms/CodeGenPrepare/basic.ll

[Chris Lattner]

Author: lattner
Date: Sat Jan 15 01:51:19 2011
New Revision: 123527

URL: http://llvm.org/viewvc/llvm-project?rev=123527&view=rev
Log:
temporarily revert r123526.  While working on a follow-on patch I
realize that ConstantFoldTerminator doesn't preserve dominfo.

Modified:
    llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp
    llvm/trunk/test/Transforms/CodeGenPrepare/basic.ll

Modified: llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp?rev=123527&r1=123526&r2=123527&view=diff
==============================================================================
--- llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp (original)
+++ llvm/trunk/lib/Transforms/Scalar/CodeGenPrepare.cpp Sat Jan 15 01:51:19 2011
@@ -1071,9 +1071,6 @@
   if (CallInst *CI = dyn_cast<CallInst>(I))
     return OptimizeCallInst(CI);
 
-  if (isa<TerminatorInst>(I))
-    return ConstantFoldTerminator(I->getParent());
-  
   return false;
 }
 

Modified: llvm/trunk/test/Transforms/CodeGenPrepare/basic.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/Transforms/CodeGenPrepare/basic.ll?rev=123527&r1=123526&r2=123527&view=diff
==============================================================================
--- llvm/trunk/test/Transforms/CodeGenPrepare/basic.ll (original)
+++ llvm/trunk/test/Transforms/CodeGenPrepare/basic.ll Sat Jan 15 01:51:19 2011
@@ -13,7 +13,9 @@
   %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