commit bcc0a0d56059a366c0c0d964fd760ee4bc83809e
author Tobias Grosser <grosser@fim.uni-passau.de> Thu Nov 17 12:56:14 2011 +0000
committer Tobias Grosser <grosser@fim.uni-passau.de> Thu Nov 17 12:56:14 2011 +0000
tree 37bb2e326a7fe887ecea7b04a1ed049bec75c0af
parent 2a7cd94215188b16c0e002f4ea55777cce4a3eff

SCEVValidator: Restructure the logic of visitAddRecExpr

Suggested by Sebastian Pop.

llvm-svn: 144904

polly/lib/Support/SCEVValidator.cpp

diff --git a/polly/lib/Support/SCEVValidator.cpp b/polly/lib/Support/SCEVValidator.cpp
index fd951af..d77e130 100644
--- a/polly/lib/Support/SCEVValidator.cpp
+++ b/polly/lib/Support/SCEVValidator.cpp
@@ -157,23 +157,23 @@
     ValidatorResult Start = visit(Expr->getStart());
     ValidatorResult Recurrence = visit(Expr->getStepRecurrence(SE));
 
-    if (!Start.isValid() || !Recurrence.isValid() || Recurrence.isIV())
+    if (!Start.isValid() || !Recurrence.isConstant())
       return ValidatorResult(SCEVType::INVALID);
 
+    if (R->contains(Expr->getLoop())) {
+      if (Recurrence.isINT()) {
+        ValidatorResult Result(SCEVType::IV);
+        Result.addParamsFrom(Start);
+        return Result;
+      }
 
-    if (!R->contains(Expr->getLoop())) {
-      if (Start.isIV())
-        return ValidatorResult(SCEVType::INVALID);
-      else
-        return ValidatorResult(SCEVType::PARAM, Expr);
+      return ValidatorResult(SCEVType::INVALID);
     }
 
-    if (!Recurrence.isINT())
-      return ValidatorResult(SCEVType::INVALID);
+    if (Start.isConstant())
+      return ValidatorResult(SCEVType::PARAM, Expr);
 
-    ValidatorResult Result(SCEVType::IV);
-    Result.addParamsFrom(Start);
-    return Result;
+    return ValidatorResult(SCEVType::INVALID);
   }
 
   struct ValidatorResult visitSMaxExpr(const SCEVSMaxExpr *Expr) {