Index: polly/trunk/include/polly/ScopInfo.h =================================================================== --- polly/trunk/include/polly/ScopInfo.h +++ polly/trunk/include/polly/ScopInfo.h @@ -1391,8 +1391,8 @@ 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 @@ 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 Index: polly/trunk/lib/Analysis/ScopBuilder.cpp =================================================================== --- polly/trunk/lib/Analysis/ScopBuilder.cpp +++ polly/trunk/lib/Analysis/ScopBuilder.cpp @@ -658,7 +658,7 @@ 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. Index: polly/trunk/lib/CodeGen/BlockGenerators.cpp =================================================================== --- polly/trunk/lib/CodeGen/BlockGenerators.cpp +++ polly/trunk/lib/CodeGen/BlockGenerators.cpp @@ -1600,7 +1600,7 @@ 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 @@ 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 Index: polly/trunk/lib/Support/VirtualInstruction.cpp =================================================================== --- polly/trunk/lib/Support/VirtualInstruction.cpp +++ polly/trunk/lib/Support/VirtualInstruction.cpp @@ -73,7 +73,7 @@ // 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);