diff options
Diffstat (limited to 'polly/lib/CodeGen/BlockGenerators.cpp')
| -rw-r--r-- | polly/lib/CodeGen/BlockGenerators.cpp | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/polly/lib/CodeGen/BlockGenerators.cpp b/polly/lib/CodeGen/BlockGenerators.cpp index 40e83acc1fa..6e01c948edb 100644 --- a/polly/lib/CodeGen/BlockGenerators.cpp +++ b/polly/lib/CodeGen/BlockGenerators.cpp @@ -1072,10 +1072,6 @@ void RegionGenerator::copyStmt(ScopStmt &Stmt, LoopToScevMapT <S, for (auto SI = succ_begin(BB), SE = succ_end(BB); SI != SE; SI++) if (R->contains(*SI) && SeenBlocks.insert(*SI).second) Blocks.push_back(*SI); - - // Remember value in case it is visible after this subregion. - if (DT.dominates(BB, R->getExit())) - ValueMap.insert(RegionMap.begin(), RegionMap.end()); } // Now create a new dedicated region exit block and add it to the region map. @@ -1086,6 +1082,12 @@ void RegionGenerator::copyStmt(ScopStmt &Stmt, LoopToScevMapT <S, repairDominance(R->getExit(), ExitBBCopy); + // Remember value in case it is visible after this subregion. Only values that + // dominate the exit node can be visible. + for (auto &Pair : RegionMaps) + if (DT.properlyDominates(Pair.first, ExitBBCopy)) + ValueMap.insert(Pair.second.begin(), Pair.second.end()); + // As the block generator doesn't handle control flow we need to add the // region control flow by hand after all blocks have been copied. for (BasicBlock *BB : SeenBlocks) { |
