After splitting, compute connected components of all new registers, not just for
the remainder register.
Example:
bb0:
x = 1
bb1:
use(x)
...
x = 2
jump bb1
When x is isolated in bb1, the inner part breaks into two components, x1 and x2:
bb0:
x0 = 1
bb1:
x1 = x0
use(x1)
...
x2 = 2
x0 = x2
jump bb1
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@117408 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/lib/CodeGen/SplitKit.cpp b/lib/CodeGen/SplitKit.cpp
index 446475e..9307286 100644
--- a/lib/CodeGen/SplitKit.cpp
+++ b/lib/CodeGen/SplitKit.cpp
@@ -842,26 +842,27 @@
for (LiveRangeEdit::iterator I = edit_.begin(), E = edit_.end(); I != E; ++I)
(*I)->RenumberValues(lis_);
- // Now check if dupli was separated into multiple connected components.
- ConnectedVNInfoEqClasses ConEQ(lis_);
- if (unsigned NumComp = ConEQ.Classify(dupli_.getLI())) {
- DEBUG(dbgs() << " Remainder has " << NumComp << " connected components: "
- << *dupli_.getLI() << '\n');
- // Did the remainder break up? Create intervals for all the components.
- if (NumComp > 1) {
- SmallVector<LiveInterval*, 8> dups;
- dups.push_back(dupli_.getLI());
- for (unsigned i = 1; i != NumComp; ++i)
- dups.push_back(&edit_.create(mri_, lis_, vrm_));
- ConEQ.Distribute(&dups[0]);
- // Rewrite uses to the new regs.
- rewrite(dupli_.getLI()->reg);
- }
- }
-
// Rewrite instructions.
rewrite(edit_.getReg());
+ // Now check if any registers were separated into multiple components.
+ ConnectedVNInfoEqClasses ConEQ(lis_);
+ for (unsigned i = 0, e = edit_.size(); i != e; ++i) {
+ // Don't use iterators, they are invalidated by create() below.
+ LiveInterval *li = edit_.get(i);
+ unsigned NumComp = ConEQ.Classify(li);
+ if (NumComp <= 1)
+ continue;
+ DEBUG(dbgs() << " " << NumComp << " components: " << *li << '\n');
+ SmallVector<LiveInterval*, 8> dups;
+ dups.push_back(li);
+ for (unsigned i = 1; i != NumComp; ++i)
+ dups.push_back(&edit_.create(mri_, lis_, vrm_));
+ ConEQ.Distribute(&dups[0]);
+ // Rewrite uses to the new regs.
+ rewrite(li->reg);
+ }
+
// Calculate spill weight and allocation hints for new intervals.
VirtRegAuxInfo vrai(vrm_.getMachineFunction(), lis_, sa_.loops_);
for (LiveRangeEdit::iterator I = edit_.begin(), E = edit_.end(); I != E; ++I){