[polly] r209696 - delinearize does not return a remainder

[Sebastian Pop]

Author: spop
Date: Tue May 27 17:42:11 2014
New Revision: 209696

URL: http://llvm.org/viewvc/llvm-project?rev=209696&view=rev
Log:
delinearize does not return a remainder

Modified:
    polly/trunk/lib/Analysis/ScopDetection.cpp
    polly/trunk/lib/Analysis/TempScopInfo.cpp

Modified: polly/trunk/lib/Analysis/ScopDetection.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopDetection.cpp?rev=209696&r1=209695&r2=209696&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopDetection.cpp (original)
+++ polly/trunk/lib/Analysis/ScopDetection.cpp Tue May 27 17:42:11 2014
@@ -371,8 +371,8 @@ bool ScopDetection::hasAffineMemoryAcces
         return invalid<ReportNonAffineAccess>(Context, /*Assert=*/true, AF);
 
       SmallVector<const SCEV *, 4> Subscripts;
-      if (!AF->computeAccessFunctions(*SE, Subscripts, Sizes) ||
-          Sizes.empty() || Subscripts.empty())
+      AF->computeAccessFunctions(*SE, Subscripts, Sizes);
+      if(Sizes.empty() || Subscripts.empty())
         return invalid<ReportNonAffineAccess>(Context, /*Assert=*/true, AF);
 
       // Check that the delinearized subscripts are affine.

Modified: polly/trunk/lib/Analysis/TempScopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/TempScopInfo.cpp?rev=209696&r1=209695&r2=209696&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/TempScopInfo.cpp (original)
+++ polly/trunk/lib/Analysis/TempScopInfo.cpp Tue May 27 17:42:11 2014
@@ -172,8 +172,7 @@ IRAccess TempScopInfo::buildIRAccess(Ins
 
   if (!IsAffine && PollyDelinearize && AF) {
     const SCEV *ElementSize = SE->getElementSize(Inst);
-    const SCEV *Remainder =
-        AF->delinearize(*SE, Subscripts, Sizes, ElementSize);
+    AF->delinearize(*SE, Subscripts, Sizes, ElementSize);
     int NSubs = Subscripts.size();
 
     if (NSubs > 0) {
@@ -181,7 +180,6 @@ IRAccess TempScopInfo::buildIRAccess(Ins
       // dimension" and the remainder of the delinearization.
       Subscripts[NSubs - 1] =
           SE->getMulExpr(Subscripts[NSubs - 1], Sizes[NSubs - 1]);
-      Subscripts[NSubs - 1] = SE->getAddExpr(Subscripts[NSubs - 1], Remainder);
 
       IsAffine = true;
       for (int i = 0; i < NSubs; ++i)