diff options
| -rw-r--r-- | polly/include/polly/ScopInfo.h | 6 | ||||
| -rw-r--r-- | polly/lib/Analysis/ScopBuilder.cpp | 2 | ||||
| -rw-r--r-- | polly/lib/CodeGen/BlockGenerators.cpp | 4 | ||||
| -rw-r--r-- | polly/lib/Support/VirtualInstruction.cpp | 2 |
4 files changed, 7 insertions, 7 deletions
diff --git a/polly/include/polly/ScopInfo.h b/polly/include/polly/ScopInfo.h index f7473bee7c3..e016a2ba3de 100644 --- a/polly/include/polly/ScopInfo.h +++ b/polly/include/polly/ScopInfo.h @@ -1391,8 +1391,8 @@ public: return getRegion()->contains(L); } - /// Return whether this statement contains @p BB. - bool contains(BasicBlock *BB) const { + /// Return whether this statement represents @p BB. + bool represents(BasicBlock *BB) const { if (isCopyStmt()) return false; if (isBlockStmt()) @@ -1404,7 +1404,7 @@ public: bool contains(Instruction *Inst) const { if (!Inst) return false; - return contains(Inst->getParent()); + return represents(Inst->getParent()); } /// Return the closest innermost loop that contains this statement, but is not diff --git a/polly/lib/Analysis/ScopBuilder.cpp b/polly/lib/Analysis/ScopBuilder.cpp index cf253bfa8cc..1210a525f75 100644 --- a/polly/lib/Analysis/ScopBuilder.cpp +++ b/polly/lib/Analysis/ScopBuilder.cpp @@ -658,7 +658,7 @@ void ScopBuilder::buildAccessFunctions(ScopStmt *Stmt, BasicBlock &BB, assert( !Stmt == IsExitBlock && "The exit BB is the only one that cannot be represented by a statement"); - assert(IsExitBlock || Stmt->contains(&BB)); + assert(IsExitBlock || Stmt->represents(&BB)); // We do not build access functions for error blocks, as they may contain // instructions we can not model. diff --git a/polly/lib/CodeGen/BlockGenerators.cpp b/polly/lib/CodeGen/BlockGenerators.cpp index 21aa508b386..5b01f950892 100644 --- a/polly/lib/CodeGen/BlockGenerators.cpp +++ b/polly/lib/CodeGen/BlockGenerators.cpp @@ -1600,7 +1600,7 @@ void RegionGenerator::addOperandToPHI(ScopStmt &Stmt, PHINode *PHI, BasicBlock *BBCopyEnd = EndBlockMap[IncomingBB]; if (!BBCopyStart) { assert(!BBCopyEnd); - assert(Stmt.contains(IncomingBB) && + assert(Stmt.represents(IncomingBB) && "Bad incoming block for PHI in non-affine region"); IncompletePHINodeMap[IncomingBB].push_back(std::make_pair(PHI, PHICopy)); return; @@ -1612,7 +1612,7 @@ void RegionGenerator::addOperandToPHI(ScopStmt &Stmt, PHINode *PHI, Value *OpCopy = nullptr; - if (Stmt.contains(IncomingBB)) { + if (Stmt.represents(IncomingBB)) { Value *Op = PHI->getIncomingValueForBlock(IncomingBB); // If the current insert block is different from the PHIs incoming block diff --git a/polly/lib/Support/VirtualInstruction.cpp b/polly/lib/Support/VirtualInstruction.cpp index 22f09010582..13b0d74bec3 100644 --- a/polly/lib/Support/VirtualInstruction.cpp +++ b/polly/lib/Support/VirtualInstruction.cpp @@ -73,7 +73,7 @@ VirtualUse VirtualUse::create(Scop *S, ScopStmt *UserStmt, Loop *UserScope, // A use is inter-statement if either it is defined in another statement, or // there is a MemoryAccess that reads its value that has been written by // another statement. - if (InputMA || (!Virtual && !UserStmt->contains(Inst->getParent()))) + if (InputMA || (!Virtual && !UserStmt->represents(Inst->getParent()))) return VirtualUse(UserStmt, Val, Inter, nullptr, InputMA); return VirtualUse(UserStmt, Val, Intra, nullptr, nullptr); |
