Revert r230280: "Bugfix: SCEVExpander incorrectly marks increment operations as no-wrap"

This caused PR22674, failing this assert:

Instructions.h:2281: llvm::Value* llvm::PHINode::getOperand(unsigned int) const: Assertion `i_nocapture < OperandTraits<PHINode>::operands(this) && "getOperand() out of range!"' failed.

llvm-svn: 230341

2 files changed, 1 insertions, 31 deletions

diff --git a/llvm/test/Analysis/ScalarEvolution/scev-expander-incorrect-nowrap.ll b/llvm/test/Analysis/ScalarEvolution/scev-expander-incorrect-nowrap.ll
deleted file mode 100644
index 012cad743df..00000000000
--- a/llvm/test/Analysis/ScalarEvolution/scev-expander-incorrect-nowrap.ll
+++ /dev/null
@@ -1,30 +0,0 @@
-; RUN: opt -indvars -S < %s | FileCheck %s
-
-declare void @use(i32)
-declare void @use.i8(i8)
-
-define void @f() {
-; CHECK-LABEL: @f
- entry:
-  br label %loop
-
- loop:
-; The only use for idx.mirror is to induce an nuw for %idx.  It does
-; not induce an nuw for %idx.inc
-  %idx.mirror = phi i8 [ -6, %entry ], [ %idx.mirror.inc, %loop ]
-  %idx = phi i8 [ -5, %entry ], [ %idx.inc, %loop ]
-
-  %idx.sext = sext i8 %idx to i32
-  call void @use(i32 %idx.sext)
-
-  %idx.mirror.inc = add nuw i8 %idx.mirror, 1
-  call void @use.i8(i8 %idx.mirror.inc)
-
-  %idx.inc = add i8 %idx, 1
-; CHECK-NOT: %indvars.iv.next = add nuw nsw i32 %indvars.iv, 1
-  %cmp = icmp ugt i8 %idx.inc, 0
-  br i1 %cmp, label %loop, label %exit
-
- exit:
-  ret void
-}
diff --git a/llvm/test/Analysis/ScalarEvolution/zext-signed-addrec.ll b/llvm/test/Analysis/ScalarEvolution/zext-signed-addrec.ll
index 43698204a72..27aed3b0da1 100644
--- a/llvm/test/Analysis/ScalarEvolution/zext-signed-addrec.ll
+++ b/llvm/test/Analysis/ScalarEvolution/zext-signed-addrec.ll
@@ -43,7 +43,7 @@ if.end:                                           ; preds = %if.end, %for.cond1.
   %shl = and i32 %conv7, 510
   store i32 %shl, i32* @c, align 4
 
-; CHECK: %lsr.iv.next = add nsw i32 %lsr.iv, -258
+; CHECK: %lsr.iv.next = add i32 %lsr.iv, -258
   %dec = add i8 %2, -1
 
   %cmp2 = icmp sgt i8 %dec, -1