6502/llvm-6502
1
0
Fork 0
mirror of https://github.com/c64scene-ar/llvm-6502.git synced 2025-01-31 10:34:17 +00:00
Code Issues Projects Releases Wiki Activity

Update LocalRewriter::DistanceMap when inserting stack loads.

Browse Source 
In the included test case, a stack load was not included in DistanceMap. That
caused TransferDeadness to ignore the instruction, leading to a scavenger
assert.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@79090 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
Jakob Stoklund Olesen 2009-08-15 11:03:03 +00:00
parent c4f661e3de
commit 7a1e872564
2 changed files with 28 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
lib/CodeGen/VirtRegRewriter.cpp
View File

@ -1587,6 +1587,7 @@ private:
MachineInstr *LoadMI = prior(InsertLoc); MachineInstr *LoadMI = prior(InsertLoc);
VRM.addSpillSlotUse(SS, LoadMI); VRM.addSpillSlotUse(SS, LoadMI);
++NumPSpills; ++NumPSpills;
DistanceMap.insert(std::make_pair(LoadMI, Dist++));
} }
NextMII = next(MII); NextMII = next(MII);
} }
@ -1678,6 +1679,7 @@ private:
MachineInstr *LoadMI = prior(InsertLoc); MachineInstr *LoadMI = prior(InsertLoc);
VRM.addSpillSlotUse(SSorRMId, LoadMI); VRM.addSpillSlotUse(SSorRMId, LoadMI);
++NumLoads; ++NumLoads;
DistanceMap.insert(std::make_pair(LoadMI, Dist++));
} }
// This invalidates Phys. // This invalidates Phys.
@ -1977,6 +1979,7 @@ private:
MachineInstr *LoadMI = prior(InsertLoc); MachineInstr *LoadMI = prior(InsertLoc);
VRM.addSpillSlotUse(SSorRMId, LoadMI); VRM.addSpillSlotUse(SSorRMId, LoadMI);
++NumLoads; ++NumLoads;
DistanceMap.insert(std::make_pair(LoadMI, Dist++));
} }
// This invalidates PhysReg. // This invalidates PhysReg.
Spills.ClobberPhysReg(PhysReg); Spills.ClobberPhysReg(PhysReg);

25
test/CodeGen/Blackfin/2009-08-15-MissingDead.ll Normal file
View File

@ -0,0 +1,25 @@
; RUN: llvm-as < %s | llc -march=bfin -verify-machineinstrs
; LocalRewriter can forget to transfer a <def,dead> flag when setting up call
; argument registers. This then causes register scavenger asserts.
declare i32 @printf(i8*, i32, float)
define i32 @testissue(i32 %i, float %x, float %y) {
br label %bb1
bb1: ; preds = %bb1, %0
%x2 = fmul float %x, 5.000000e-01 ; <float> [#uses=1]
%y2 = fmul float %y, 0x3FECCCCCC0000000 ; <float> [#uses=1]
%z2 = fadd float %x2, %y2 ; <float> [#uses=1]
%z3 = fadd float undef, %z2 ; <float> [#uses=1]
%i1 = shl i32 %i, 3 ; <i32> [#uses=1]
%j1 = add i32 %i, 7 ; <i32> [#uses=1]
%m1 = add i32 %i1, %j1 ; <i32> [#uses=2]
%b = icmp sle i32 %m1, 6 ; <i1> [#uses=1]
br i1 %b, label %bb1, label %bb2
bb2: ; preds = %bb1
%1 = call i32 @printf(i8* undef, i32 %m1, float %z3); <i32> [#uses=0]
ret i32 0
}