diff options
| author | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2009-08-02 20:29:41 +0000 |
|---|---|---|
| committer | Jakob Stoklund Olesen <stoklund@2pi.dk> | 2009-08-02 20:29:41 +0000 |
| commit | b36eb9df205aa83cfdfc8ecebc93e1043d6253d9 (patch) | |
| tree | 7e2f1cb8e86568a2cc6703d40470b0daa9ef7ce1 | |
| parent | 7b4e503cdc32eb7e8491f028d946f5528025ea7e (diff) | |
Fix issue in regscavenger when scavenging a callee-saved register that has not been spilled.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@77912 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/CodeGen/RegisterScavenging.cpp | 9 | ||||
| -rw-r--r-- | test/CodeGen/Blackfin/addsub-i128.ll | 6 |
2 files changed, 11 insertions, 4 deletions
diff --git a/lib/CodeGen/RegisterScavenging.cpp b/lib/CodeGen/RegisterScavenging.cpp index e32d23264d..e1c8f2fe22 100644 --- a/lib/CodeGen/RegisterScavenging.cpp +++ b/lib/CodeGen/RegisterScavenging.cpp @@ -471,9 +471,16 @@ unsigned RegScavenger::scavengeRegister(const TargetRegisterClass *RC, Reg = Candidates.find_next(Reg); } - assert(ScavengedReg == 0 && + assert(ScavengedReg == 0 && "Scavenger slot is live, unable to scavenge another register!"); + // Make sure SReg is marked as used. It could be considered available if it is + // one of the callee saved registers, but hasn't been spilled. + if (!isUsed(SReg)) { + MBB->addLiveIn(SReg); + setUsed(SReg); + } + // Spill the scavenged register before I. TII->storeRegToStackSlot(*MBB, I, SReg, true, ScavengingFrameIndex, RC); MachineBasicBlock::iterator II = prior(I); diff --git a/test/CodeGen/Blackfin/addsub-i128.ll b/test/CodeGen/Blackfin/addsub-i128.ll index 8dd04d808a..f0934e9307 100644 --- a/test/CodeGen/Blackfin/addsub-i128.ll +++ b/test/CodeGen/Blackfin/addsub-i128.ll @@ -1,7 +1,7 @@ ; RUN: llvm-as < %s | llc -march=bfin -verify-machineinstrs -; XFAIL: * -; Assertion failed: (isUsed(Reg) && "Using an undefined register!"), -; function forward, file RegisterScavenging.cpp, line 182. + +; These functions have just the right size to annoy the register scavenger: They +; use all the scratch registers, but not all the callee-saved registers. define void @test_add(i64 %AL, i64 %AH, i64 %BL, i64 %BH, i64* %RL, i64* %RH) { entry: |