intel/llvm
1
0
Fork 0
mirror of https://github.com/intel/llvm.git synced 2026-01-18 07:57:36 +08:00
Code Issues Packages Projects Releases Wiki Activity

Fix gcc compile failure

Browse Source 
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
This commit is contained in:
Tobias Grosser
2016-07-11 12:27:04 +00:00
parent 4e2d9c45b9
commit faef9a7667
3 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
polly/include/polly/ScopInfo.h
View File

@@ -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.

4
polly/lib/Analysis/ScopInfo.cpp
View File

@@ -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.

2
polly/lib/CodeGen/IslNodeBuilder.cpp
View File

@@ -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;