mirror of
https://github.com/c64scene-ar/llvm-6502.git
synced 2024-08-23 02:29:18 +00:00
Bugfix in InlineSpiller::traceSiblingValue().
Properly determine whether or not a phi was added by splitting. Check against the current VNInfo of OrigLI instead of against the OrigVNI argument. Patch provided by Jonas Paulsson. Reviewed by Quentin Colombet. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@224009 91177308-0d34-0410-b5e6-96231b3b80d8
This commit is contained in:
parent
bcb1a626b6
commit
40c2ddeffe
@ -508,6 +508,7 @@ MachineInstr *InlineSpiller::traceSiblingValue(unsigned UseReg, VNInfo *UseVNI,
|
|||||||
SmallVector<std::pair<unsigned, VNInfo*>, 8> WorkList;
|
SmallVector<std::pair<unsigned, VNInfo*>, 8> WorkList;
|
||||||
WorkList.push_back(std::make_pair(UseReg, UseVNI));
|
WorkList.push_back(std::make_pair(UseReg, UseVNI));
|
||||||
|
|
||||||
|
LiveInterval &OrigLI = LIS.getInterval(Original);
|
||||||
do {
|
do {
|
||||||
unsigned Reg;
|
unsigned Reg;
|
||||||
VNInfo *VNI;
|
VNInfo *VNI;
|
||||||
@ -521,8 +522,11 @@ MachineInstr *InlineSpiller::traceSiblingValue(unsigned UseReg, VNInfo *UseVNI,
|
|||||||
|
|
||||||
// Trace through PHI-defs created by live range splitting.
|
// Trace through PHI-defs created by live range splitting.
|
||||||
if (VNI->isPHIDef()) {
|
if (VNI->isPHIDef()) {
|
||||||
// Stop at original PHIs. We don't know the value at the predecessors.
|
// Stop at original PHIs. We don't know the value at the
|
||||||
if (VNI->def == OrigVNI->def) {
|
// predecessors. Look up the VNInfo for the current definition
|
||||||
|
// in OrigLI, to properly determine whether or not this phi was
|
||||||
|
// added by splitting.
|
||||||
|
if (VNI->def == OrigLI.getVNInfoAt(VNI->def)->def) {
|
||||||
DEBUG(dbgs() << "orig phi value\n");
|
DEBUG(dbgs() << "orig phi value\n");
|
||||||
SVI->second.DefByOrigPHI = true;
|
SVI->second.DefByOrigPHI = true;
|
||||||
SVI->second.AllDefsAreReloads = false;
|
SVI->second.AllDefsAreReloads = false;
|
||||||
@ -542,7 +546,6 @@ MachineInstr *InlineSpiller::traceSiblingValue(unsigned UseReg, VNInfo *UseVNI,
|
|||||||
// Separate all values dominated by OrigVNI into PHIs and non-PHIs.
|
// Separate all values dominated by OrigVNI into PHIs and non-PHIs.
|
||||||
SmallVector<VNInfo*, 8> PHIs, NonPHIs;
|
SmallVector<VNInfo*, 8> PHIs, NonPHIs;
|
||||||
LiveInterval &LI = LIS.getInterval(Reg);
|
LiveInterval &LI = LIS.getInterval(Reg);
|
||||||
LiveInterval &OrigLI = LIS.getInterval(Original);
|
|
||||||
|
|
||||||
for (LiveInterval::vni_iterator VI = LI.vni_begin(), VE = LI.vni_end();
|
for (LiveInterval::vni_iterator VI = LI.vni_begin(), VE = LI.vni_end();
|
||||||
VI != VE; ++VI) {
|
VI != VE; ++VI) {
|
||||||
|
Loading…
Reference in New Issue
Block a user