[polly] r260030 - Simplify code [NFC]

[Johannes Doerfert via llvm-commits]

Author: jdoerfert
Date: Sun Feb  7 07:57:32 2016
New Revision: 260030

URL: http://llvm.org/viewvc/llvm-project?rev=260030&view=rev
Log:
Simplify code [NFC]

Modified:
    polly/trunk/lib/Analysis/ScopInfo.cpp
    polly/trunk/lib/CodeGen/IslNodeBuilder.cpp

Modified: polly/trunk/lib/Analysis/ScopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopInfo.cpp?rev=260030&r1=260029&r2=260030&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopInfo.cpp (original)
+++ polly/trunk/lib/Analysis/ScopInfo.cpp Sun Feb  7 07:57:32 2016
@@ -552,6 +552,7 @@ MemoryAccess::createBasicAccessMap(ScopS
 // constraints is the set of constraints that needs to be assumed to ensure such
 // statement instances are never executed.
 void MemoryAccess::assumeNoOutOfBound() {
+  auto *SAI = getScopArrayInfo();
   isl_space *Space = isl_space_range(getOriginalAccessRelationSpace());
   isl_set *Outside = isl_set_empty(isl_space_copy(Space));
   for (int i = 1, Size = isl_space_dim(Space, isl_dim_set); i < Size; ++i) {
@@ -563,7 +564,7 @@ void MemoryAccess::assumeNoOutOfBound()
     isl_set *DimOutside;
 
     DimOutside = isl_pw_aff_lt_set(isl_pw_aff_copy(Var), Zero);
-    isl_pw_aff *SizeE = getScopArrayInfo()->getDimensionSizePw(i);
+    isl_pw_aff *SizeE = SAI->getDimensionSizePw(i);
     SizeE = isl_pw_aff_add_dims(SizeE, isl_dim_in,
                                 isl_space_dim(Space, isl_dim_set));
     SizeE = isl_pw_aff_set_tuple_id(SizeE, isl_dim_in,
@@ -940,6 +941,7 @@ void ScopStmt::restrictDomain(__isl_take
 }
 
 void ScopStmt::buildAccessRelations() {
+  Scop &S = *getParent();
   for (MemoryAccess *Access : MemAccs) {
     Type *ElementType = Access->getAccessValue()->getType();
 
@@ -953,9 +955,8 @@ void ScopStmt::buildAccessRelations() {
     else
       Ty = ScopArrayInfo::MK_Array;
 
-    const ScopArrayInfo *SAI = getParent()->getOrCreateScopArrayInfo(
-        Access->getBaseAddr(), ElementType, Access->Sizes, Ty);
-
+    auto *SAI = S.getOrCreateScopArrayInfo(Access->getBaseAddr(), ElementType,
+                                           Access->Sizes, Ty);
     Access->buildAccessRelation(SAI);
   }
 }

Modified: polly/trunk/lib/CodeGen/IslNodeBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslNodeBuilder.cpp?rev=260030&r1=260029&r2=260030&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/IslNodeBuilder.cpp (original)
+++ polly/trunk/lib/CodeGen/IslNodeBuilder.cpp Sun Feb  7 07:57:32 2016
@@ -1020,7 +1020,7 @@ bool IslNodeBuilder::preloadInvariantEqu
 
   // If the base pointer of this class is dependent on another one we have to
   // make sure it was preloaded already.
-  auto *SAI = S.getScopArrayInfo(MA->getBaseAddr(), ScopArrayInfo::MK_Array);
+  auto *SAI = MA->getScopArrayInfo();
   if (const auto *BaseIAClass = S.lookupInvariantEquivClass(SAI->getBasePtr()))
     if (!preloadInvariantEquivClass(*BaseIAClass))
       return false;