1 files changed, 8 insertions, 4 deletions
diff --git a/lib/Analysis/ScalarEvolution.cpp b/lib/Analysis/ScalarEvolution.cpp
index d3d65847cb..89daec8053 100644
--- a/lib/Analysis/ScalarEvolution.cpp
+++ b/lib/Analysis/ScalarEvolution.cpp
@@ -1560,10 +1560,14 @@ const SCEV *ScalarEvolution::getAddExpr(SmallVectorImpl<const SCEV *> &Ops,
       AddRecOps[0] = getAddExpr(LIOps);
 
       // Build the new addrec. Propagate the NUW and NSW flags if both the
-      // outer add and the inner addrec are guaranteed to have no overflow.
-      const SCEV *NewRec = getAddRecExpr(AddRecOps, AddRecLoop,
-                                         HasNUW && AddRec->hasNoUnsignedWrap(),
-                                         HasNSW && AddRec->hasNoSignedWrap());
+      // outer add and the inner addrec are guaranteed to have no overflow or if
+      // there is no outer part.
+      if (Ops.size() != 1) {
+        HasNUW &= AddRec->hasNoUnsignedWrap();
+        HasNSW &= AddRec->hasNoSignedWrap();
+      }
+      
+      const SCEV *NewRec = getAddRecExpr(AddRecOps, AddRecLoop, HasNUW, HasNSW);
 
       // If all of the other operands were loop invariant, we are done.
       if (Ops.size() == 1) return NewRec;