Fix non-affine generated entering node not being recognized as dominating
Scalar reloads in the generated entering block were not recognized as
dominating the subregions locks when there were multiple entering
nodes. This resulted in values defined in there not being copied.
As a fix, we unconditionally add the BBMap of the generated entering
node to the generated entry. This fixes part of llvm.org/PR25439.
llvm-svn: 252445
diff --git a/polly/lib/CodeGen/BlockGenerators.cpp b/polly/lib/CodeGen/BlockGenerators.cpp
index ace05a3..ecfb857 100644
--- a/polly/lib/CodeGen/BlockGenerators.cpp
+++ b/polly/lib/CodeGen/BlockGenerators.cpp
@@ -1031,7 +1031,8 @@
EntryBBCopy->setName("polly.stmt." + EntryBB->getName() + ".entry");
Builder.SetInsertPoint(&EntryBBCopy->front());
- generateScalarLoads(Stmt, RegionMaps[EntryBBCopy]);
+ ValueMapT &EntryBBMap = RegionMaps[EntryBBCopy];
+ generateScalarLoads(Stmt, EntryBBMap);
for (auto PI = pred_begin(EntryBB), PE = pred_end(EntryBB); PI != PE; ++PI)
if (!R->contains(*PI))
@@ -1054,11 +1055,18 @@
// In order to remap PHI nodes we store also basic block mappings.
BlockMap[BB] = BBCopy;
- // Get the mapping for this block and initialize it with the mapping
- // available at its immediate dominator (in the new region).
- ValueMapT &RegionMap = RegionMaps[BBCopy];
- if (BBCopy != EntryBBCopy)
- RegionMap = RegionMaps[BBCopyIDom];
+ // Get the mapping for this block and initialize it with either the scalar
+ // loads from the generated entering block (which dominates all blocks of
+ // this subregion) or the maps of the immediate dominator, if part of the
+ // subregion. The latter necessarily includes the former.
+ ValueMapT *InitBBMap;
+ if (BBCopyIDom) {
+ assert(RegionMaps.count(BBCopyIDom));
+ InitBBMap = &RegionMaps[BBCopyIDom];
+ } else
+ InitBBMap = &EntryBBMap;
+ auto Inserted = RegionMaps.insert(std::make_pair(BBCopy, *InitBBMap));
+ ValueMapT &RegionMap = Inserted.first->second;
// Copy the block with the BlockGenerator.
Builder.SetInsertPoint(&BBCopy->front());