Revert this use of NUW/NSW also. Overflow-undefined multiplication isn't
associative either.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@91701 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp
index 3c937e0..ec901b7 100644
--- a/lib/Analysis/ScalarEvolution.cpp
+++ b/lib/Analysis/ScalarEvolution.cpp
@@ -1460,7 +1460,10 @@
AddRec->op_end());
AddRecOps[0] = getAddExpr(LIOps);
+ // It's tempting to propogate NUW/NSW flags here, but nuw/nsw addition
+ // is not associative so this isn't necessarily safe.
const SCEV *NewRec = getAddRecExpr(AddRecOps, AddRec->getLoop());
+
// If all of the other operands were loop invariant, we are done.
if (Ops.size() == 1) return NewRec;
@@ -1636,9 +1639,9 @@
}
}
- const SCEV *NewRec = getAddRecExpr(NewOps, AddRec->getLoop(),
- AddRec->hasNoUnsignedWrap() && HasNUW,
- AddRec->hasNoSignedWrap() && HasNSW);
+ // It's tempting to propogate NUW/NSW flags here, but nuw/nsw multiplication
+ // is not associative so this isn't necessarily safe.
+ const SCEV *NewRec = getAddRecExpr(NewOps, AddRec->getLoop());
// If all of the other operands were loop invariant, we are done.
if (Ops.size() == 1) return NewRec;