Use the new predicate to control when we do prealloc splitting. Fix a small bug.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@58738 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/PreAllocSplitting.cpp b/lib/CodeGen/PreAllocSplitting.cpp
index f09ea23..09f002a 100644
--- a/lib/CodeGen/PreAllocSplitting.cpp
+++ b/lib/CodeGen/PreAllocSplitting.cpp
@@ -648,6 +648,10 @@
if (DefMI && LIs->isReMaterializable(*LI, ValNo, DefMI))
return false;
+ // If this would create a new join point, do not split.
+ if (DefMI && createsNewJoin(LR, DefMI->getParent(), Barrier->getParent()))
+ return false;
+
// Find all references in the barrier mbb.
SmallPtrSet<MachineInstr*, 4> RefsInMBB;
for (MachineRegisterInfo::reg_iterator I = MRI->reg_begin(CurrLI->reg),
@@ -862,7 +866,7 @@
Stack.push_back(std::make_pair(PredMBB, ++S));
continue;
} else
- Stack.push_back(std::make_pair(PredMBB, ++S));
+ Stack.push_back(std::make_pair(PredMBB, S+1));
MachineBasicBlock* MBB = *S;
Visited.insert(MBB);