diff --git a/llvm/lib/CodeGen/PreAllocSplitting.cpp b/llvm/lib/CodeGen/PreAllocSplitting.cpp index 6b37637ee959..3c8257f1dac1 100644 --- a/llvm/lib/CodeGen/PreAllocSplitting.cpp +++ b/llvm/lib/CodeGen/PreAllocSplitting.cpp @@ -1127,9 +1127,11 @@ bool PreAllocSplitting::Rematerialize(unsigned vreg, VNInfo* ValNo, LIs->InsertMachineInstrInMaps(prior(RestorePt), RestoreIdx); if (KillPt->getParent() == BarrierMBB) { - UpdateRegisterInterval(ValNo, LIs->getUseIndex(KillIdx)+1, + VNInfo* After = UpdateRegisterInterval(ValNo, LIs->getUseIndex(KillIdx)+1, LIs->getDefIndex(RestoreIdx)); + RenumberValno(After); + ++NumSplits; ++NumRemats; return true; @@ -1312,9 +1314,11 @@ bool PreAllocSplitting::SplitRegLiveInterval(LiveInterval *LI) { UpdateSpillSlotInterval(ValNo, LIs->getUseIndex(SpillIndex)+1, LIs->getDefIndex(RestoreIndex)); - UpdateRegisterInterval(ValNo, LIs->getUseIndex(SpillIndex)+1, + VNInfo* After = UpdateRegisterInterval(ValNo, + LIs->getUseIndex(SpillIndex)+1, LIs->getDefIndex(RestoreIndex)); - + RenumberValno(After); + ++NumSplits; return true; } diff --git a/llvm/test/CodeGen/X86/pre-split2.ll b/llvm/test/CodeGen/X86/pre-split2.ll index 1d69aa854424..fcb3f05a8385 100644 --- a/llvm/test/CodeGen/X86/pre-split2.ll +++ b/llvm/test/CodeGen/X86/pre-split2.ll @@ -1,5 +1,5 @@ ; RUN: llvm-as < %s | llc -march=x86 -mattr=+sse2 -pre-alloc-split -stats |& \ -; RUN: grep {pre-alloc-split} | count 2 +; RUN: grep {pre-alloc-split} | count 3 define i32 @t() { entry: