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

Blind fix Polly for r206310 

llvm-svn: 206312
This commit is contained in:
David Blaikie 2014-04-15 18:45:27 +00:00
parent a9bf2463b9
commit b035f6d878
1 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
polly/lib/Analysis/ScopDetection.cpp
View File

@ -529,14 +529,14 @@ static bool regionWithoutLoops(Region &R, LoopInfo *LI) {
// //
// Return the number of regions erased from Regs. // Return the number of regions erased from Regs.
static unsigned eraseAllChildren(std::set<const Region *> &Regs, static unsigned eraseAllChildren(std::set<const Region *> &Regs,
const Region *R) { const Region &R) {
unsigned Count = 0; unsigned Count = 0;
for (const Region *SubRegion : *R) { for (auto &SubRegion : R) {
if (Regs.find(SubRegion) != Regs.end()) { if (Regs.find(SubRegion.get()) != Regs.end()) {
++Count; ++Count;
Regs.erase(SubRegion); Regs.erase(SubRegion.get());
} else { } else {
Count += eraseAllChildren(Regs, SubRegion); Count += eraseAllChildren(Regs, *SubRegion);
} }
} }
return Count; return Count;
@ -556,7 +556,7 @@ void ScopDetection::findScops(Region &R) {
InvalidRegions[&R] = LastFailure; InvalidRegions[&R] = LastFailure;
for (Region *SubRegion : R) for (auto &SubRegion : R)
findScops(*SubRegion); findScops(*SubRegion);
// Try to expand regions. // Try to expand regions.
@ -567,8 +567,8 @@ void ScopDetection::findScops(Region &R) {
std::vector<Region *> ToExpand; std::vector<Region *> ToExpand;
for (Region *SubRegion : R) for (auto &SubRegion : R)
ToExpand.push_back(SubRegion); ToExpand.push_back(SubRegion.get());
for (Region *CurrentRegion : ToExpand) { for (Region *CurrentRegion : ToExpand) {
// Skip invalid regions. Regions may become invalid, if they are element of // Skip invalid regions. Regions may become invalid, if they are element of
@ -587,7 +587,7 @@ void ScopDetection::findScops(Region &R) {
// Erase all (direct and indirect) children of ExpandedR from the valid // Erase all (direct and indirect) children of ExpandedR from the valid
// regions and update the number of valid regions. // regions and update the number of valid regions.
ValidRegion -= eraseAllChildren(ValidRegions, ExpandedR); ValidRegion -= eraseAllChildren(ValidRegions, *ExpandedR);
} }
} }