[polly] r275057 - Fix gcc compile failure

[Tobias Grosser via llvm-commits]

Author: grosser
Date: Mon Jul 11 07:27:04 2016
New Revision: 275057

URL: http://llvm.org/viewvc/llvm-project?rev=275057&view=rev
Log:
Fix gcc compile failure

Commit r275056 introduced a gcc compile failure due to us using two
types named 'Type', the first being the newly introduced member variable
'Type' the second being llvm::Type. We resolve this issue by renaming
the newly introduced member variable to AccessType.

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

Modified: polly/trunk/include/polly/ScopInfo.h
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/include/polly/ScopInfo.h?rev=275057&r1=275056&r2=275057&view=diff
==============================================================================
--- polly/trunk/include/polly/ScopInfo.h (original)
+++ polly/trunk/include/polly/ScopInfo.h Mon Jul 11 07:27:04 2016
@@ -944,7 +944,7 @@ struct InvariantEquivClassTy {
   ///
   /// It is used to differentiate between differently typed invariant loads from
   /// the same location.
-  Type *Type;
+  Type *AccessType;
 };
 
 /// @brief Type for invariant accesses equivalence classes.

Modified: polly/trunk/lib/Analysis/ScopInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/Analysis/ScopInfo.cpp?rev=275057&r1=275056&r2=275057&view=diff
==============================================================================
--- polly/trunk/lib/Analysis/ScopInfo.cpp (original)
+++ polly/trunk/lib/Analysis/ScopInfo.cpp Mon Jul 11 07:27:04 2016
@@ -3210,7 +3210,7 @@ InvariantEquivClassTy *Scop::lookupInvar
   Type *Ty = LInst->getType();
   const SCEV *PointerSCEV = SE->getSCEV(LInst->getPointerOperand());
   for (auto &IAClass : InvariantEquivClasses) {
-    if (PointerSCEV != IAClass.IdentifyingPointer || Ty != IAClass.Type)
+    if (PointerSCEV != IAClass.IdentifyingPointer || Ty != IAClass.AccessType)
       continue;
 
     auto &MAs = IAClass.InvariantAccesses;
@@ -3331,7 +3331,7 @@ void Scop::addInvariantLoads(ScopStmt &S
 
     bool Consolidated = false;
     for (auto &IAClass : InvariantEquivClasses) {
-      if (PointerSCEV != IAClass.IdentifyingPointer || Ty != IAClass.Type)
+      if (PointerSCEV != IAClass.IdentifyingPointer || Ty != IAClass.AccessType)
         continue;
 
       // If the pointer and the type is equal check if the access function wrt.

Modified: polly/trunk/lib/CodeGen/IslNodeBuilder.cpp
URL: http://llvm.org/viewvc/llvm-project/polly/trunk/lib/CodeGen/IslNodeBuilder.cpp?rev=275057&r1=275056&r2=275057&view=diff
==============================================================================
--- polly/trunk/lib/CodeGen/IslNodeBuilder.cpp (original)
+++ polly/trunk/lib/CodeGen/IslNodeBuilder.cpp Mon Jul 11 07:27:04 2016
@@ -1079,7 +1079,7 @@ bool IslNodeBuilder::preloadInvariantEqu
   // Check for recurrsion which can be caused by additional constraints, e.g.,
   // non-finitie loop contraints. In such a case we have to bail out and insert
   // a "false" runtime check that will cause the original code to be executed.
-  auto PtrId = std::make_pair(IAClass.IdentifyingPointer, IAClass.Type);
+  auto PtrId = std::make_pair(IAClass.IdentifyingPointer, IAClass.AccessType);
   if (!PreloadedPtrs.insert(PtrId).second)
     return false;