replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

ScopInfo: Replace while/iterator construct with std::remove_if 

The use of C++'s high-level iterator functionality instead of two while loops
and explicit iterator handling improves readability of this code.

Proposed-by: Michael Kruse <llvm@meinersbur.de>

Differential Revision: http://reviews.llvm.org/D15068

llvm-svn: 254305
This commit is contained in:
Tobias Grosser 2015-11-30 17:20:40 +00:00
parent ea03cf2fa1
commit ef9ca5db16
1 changed files with 9 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1464,29 +1464,17 @@ void ScopStmt::print(raw_ostream &OS) const {
void ScopStmt::dump() const { print(dbgs()); }
void ScopStmt::removeMemoryAccesses(MemoryAccessList &InvMAs) {
// Remove all memory accesses in @p InvMAs from this statement together
// with all scalar accesses that were caused by them. The tricky iteration
// order uses is needed because the MemAccs is a vector and the order in
// which the accesses of each memory access list (MAL) are stored in this
// vector is reversed.
// Remove all memory accesses in @p InvMAs from this statement
// together with all scalar accesses that were caused by them.
for (MemoryAccess *MA : InvMAs) {
auto &MAL = *lookupAccessesFor(MA->getAccessInstruction());
MAL.reverse();
auto MALIt = MAL.begin();
auto MALEnd = MAL.end();
auto MemAccsIt = MemAccs.begin();
while (MALIt != MALEnd) {
while (*MemAccsIt != *MALIt)
MemAccsIt++;
MALIt++;
MemAccs.erase(MemAccsIt);
}
auto Predicate = [&](MemoryAccess *Acc) {
return Acc == MA ||
Acc->getAccessInstruction() == MA->getAccessInstruction();
};
MemAccs.erase(std::remove_if(MemAccs.begin(), MemAccs.end(), Predicate),
MemAccs.end());
InstructionToAccess.erase(MA->getAccessInstruction());
delete &MAL;
delete lookupAccessesFor(MA->getAccessInstruction());
}
}