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.

llvm-svn: 275057

3 files changed, 4 insertions, 4 deletions

diff --git a/polly/include/polly/ScopInfo.h b/polly/include/polly/ScopInfo.h
index 374800fd68a..b8b6679a493 100644
--- a/polly/include/polly/ScopInfo.h
+++ b/polly/include/polly/ScopInfo.h
@@ -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.
diff --git a/polly/lib/Analysis/ScopInfo.cpp b/polly/lib/Analysis/ScopInfo.cpp
index 55b3ff4745a..35779b2ae68 100644
--- a/polly/lib/Analysis/ScopInfo.cpp
+++ b/polly/lib/Analysis/ScopInfo.cpp
@@ -3210,7 +3210,7 @@ InvariantEquivClassTy *Scop::lookupInvariantEquivClass(Value *Val) {
   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 &Stmt, InvariantAccessesTy &InvMAs) {
 
     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.
diff --git a/polly/lib/CodeGen/IslNodeBuilder.cpp b/polly/lib/CodeGen/IslNodeBuilder.cpp
index a60903bd69a..30fb75a8d56 100644
--- a/polly/lib/CodeGen/IslNodeBuilder.cpp
+++ b/polly/lib/CodeGen/IslNodeBuilder.cpp
@@ -1079,7 +1079,7 @@ bool IslNodeBuilder::preloadInvariantEquivClass(
   // 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;