diff options
| -rw-r--r-- | include/llvm/CodeGen/RegisterScavenging.h | 5 | ||||
| -rw-r--r-- | lib/CodeGen/RegisterScavenging.cpp | 7 |
2 files changed, 8 insertions, 4 deletions
diff --git a/include/llvm/CodeGen/RegisterScavenging.h b/include/llvm/CodeGen/RegisterScavenging.h index 0eb2b2ab07..49d16892f8 100644 --- a/include/llvm/CodeGen/RegisterScavenging.h +++ b/include/llvm/CodeGen/RegisterScavenging.h @@ -42,7 +42,7 @@ class RegScavenger { /// Information on scavenged registers (held in a spill slot). struct ScavengedInfo { - ScavengedInfo(int FI) : FrameIndex(FI), Reg(0), Restore(NULL) {} + ScavengedInfo(int FI = -1) : FrameIndex(FI), Reg(0), Restore(NULL) {} /// A spill slot used for scavenging a register post register allocation. int FrameIndex; @@ -130,7 +130,8 @@ public: void getScavengingFrameIndices(SmallVectorImpl<int> &A) const { for (SmallVector<ScavengedInfo, 2>::const_iterator I = Scavenged.begin(), IE = Scavenged.end(); I != IE; ++I) - A.push_back(I->FrameIndex); + if (I->FrameIndex >= 0) + A.push_back(I->FrameIndex); } /// scavengeRegister - Make a register of the specific register class diff --git a/lib/CodeGen/RegisterScavenging.cpp b/lib/CodeGen/RegisterScavenging.cpp index 4c85644e1a..6b85cd93cf 100644 --- a/lib/CodeGen/RegisterScavenging.cpp +++ b/lib/CodeGen/RegisterScavenging.cpp @@ -371,8 +371,11 @@ unsigned RegScavenger::scavengeRegister(const TargetRegisterClass *RC, if (Scavenged[SI].Reg == 0) break; - assert(SI < Scavenged.size() && - "Scavenger slots are live, unable to scavenge another register!"); + if (SI < Scavenged.size()) { + // We need to scavenge a register but have no spill slot, the target + // must know how to do it (if not, we'll assert below). + Scavenged.push_back(ScavengedInfo()); + } // Avoid infinite regress Scavenged[SI].Reg = SReg; |