Reapply r139759. Disable IV rewriting by default. See PR10916.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@139842 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Transforms/Scalar/IndVarSimplify.cpp b/lib/Transforms/Scalar/IndVarSimplify.cpp
index b5500dec6e74b73b28a029bd69bdd0490a2cad05..e240c42e36c2d0925d9ef9c5ea07d8d1518f65dc 100644 (file)
--- a/lib/Transforms/Scalar/IndVarSimplify.cpp
+++ b/lib/Transforms/Scalar/IndVarSimplify.cpp
@@ -60,7 +60,7 @@ STATISTIC(NumElimIV      , "Number of congruent IVs eliminated");
 
 namespace llvm {
   cl::opt<bool> EnableIVRewrite(
-    "enable-iv-rewrite", cl::Hidden, cl::init(true),
+    "enable-iv-rewrite", cl::Hidden,
     cl::desc("Enable canonical induction variable rewriting"));
 
   // Trip count verification can be enabled by default under NDEBUG if we

diff --git a/test/Transforms/IndVarSimplify/floating-point-iv.ll b/test/Transforms/IndVarSimplify/floating-point-iv.ll
index e334f069b81d978c57a5f1f761c43b71772f40c4..266eebd5bb656f55ffd3806acafdf47f0fcebe75 100644 (file)
--- a/test/Transforms/IndVarSimplify/floating-point-iv.ll
+++ b/test/Transforms/IndVarSimplify/floating-point-iv.ll
@@ -87,6 +87,6 @@ exit:
   ret void
 
 ; CHECK: @test5
-; CHECK: icmp eq i32 {{.*}}, 10
+; CHECK: icmp slt i32 {{.*}}, 0
 ; CHECK-NEXT: br i1
 }

diff --git a/test/Transforms/LoopUnroll/scevunroll.ll b/test/Transforms/LoopUnroll/scevunroll.ll
index 9971f310ec452b75ab9f2250bf322a9c9231235e..99b3a7d861971e323f6c8ae3da5f21f6316f1d3e 100644 (file)
--- a/test/Transforms/LoopUnroll/scevunroll.ll
+++ b/test/Transforms/LoopUnroll/scevunroll.ll
@@ -67,7 +67,7 @@ exit2:
 ; SCEV properly unrolls multi-exit loops.
 ;
 ; CHECK: @multiExit
-; CHECK: getelementptr i32* %base, i64 10
+; CHECK: getelementptr i32* %base, i32 10
 ; CHECK-NEXT: load i32*
 ; CHECK: br i1 false, label %l2.10, label %exit1
 ; CHECK: l2.10: