Revert "r219834 - Teach ScalarEvolution to sharpen range information"

This change breaks the asan buildbots:
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux/builds/13468

llvm-svn: 219878

2 files changed, 2 insertions, 40 deletions

diff --git a/llvm/test/Transforms/IndVarSimplify/sharpen-range-metadata.ll b/llvm/test/Transforms/IndVarSimplify/sharpen-range-metadata.ll
deleted file mode 100644
index 5faafe6c47a..00000000000
--- a/llvm/test/Transforms/IndVarSimplify/sharpen-range-metadata.ll
+++ /dev/null
@@ -1,39 +0,0 @@
-;; RUN: opt -S < %s -indvars | FileCheck %s
-
-;; Check if llvm can narrow !range metadata based on loop entry
-;; predicates.
-
-declare void @abort()
-
-define i1 @bounded_below(i32* nocapture readonly %buffer) {
-entry:
-  %length = load i32* %buffer, !range !0
-  %entry.pred = icmp eq i32 %length, 0
-  br i1 %entry.pred, label %abort, label %loop.preheader
-
-loop.preheader:
-  br label %loop
-
-loop:
-  %idx = phi i32 [ %idx.inc, %loop.next ], [ 0, %loop.preheader ]
-  %oob.pred = icmp slt i32 %idx, %length
-  br i1 %oob.pred, label %loop.next, label %oob
-; CHECK: br i1 true, label %loop.next, label %oob
-
-loop.next:
-  %idx.inc = add i32 %idx, 1
-  %exit.pred = icmp slt i32 %idx.inc, %length
-  br i1 %exit.pred, label %loop, label %abort.loopexit
-
-abort.loopexit:
-  br label %abort
-
-abort:
-  ret i1 false
-
-oob:
-  tail call void @abort()
-  ret i1 false
-}
-
-!0 = metadata !{i32 0, i32 100}
diff --git a/llvm/test/Transforms/IndVarSimplify/widen-loop-comp.ll b/llvm/test/Transforms/IndVarSimplify/widen-loop-comp.ll
index 0930a0c4139..bfe74afe894 100644
--- a/llvm/test/Transforms/IndVarSimplify/widen-loop-comp.ll
+++ b/llvm/test/Transforms/IndVarSimplify/widen-loop-comp.ll
@@ -67,7 +67,8 @@ for.end:
 define void @test2([8 x i8]* %a, i8* %b, i8 %limit) {
 entry:
   %conv = zext i8 %limit to i32
-  br i1 undef, label %for.cond1.preheader, label %for.cond1.preheader.us
+  %cmp23 = icmp eq i8 %limit, 0
+  br i1 %cmp23, label %for.cond1.preheader, label %for.cond1.preheader.us
 
 for.cond1.preheader.us:
   %storemerge5.us = phi i32 [ 0, %entry ], [ %inc14.us, %for.inc13.us ]