maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix for PR1266. Don't mark a two address operand IsKill. 

llvm-svn: 35365
This commit is contained in:
Evan Cheng 2007-03-26 22:40:42 +00:00
parent f3200ef9ac
commit 4a09b1b5be
2 changed files with 33 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
llvm/lib/CodeGen/LiveIntervalAnalysis.cpp
View File

@ -854,9 +854,9 @@ bool LiveIntervals::AdjustCopiesBackFrom(LiveInterval &IntA, LiveInterval &IntB,
// If the source instruction was killing the source register before the
// merge, unset the isKill marker given the live range has been extended.
MachineOperand *MOK = ValLREndInst->findRegisterUseOperand(IntB.reg, true);
if (MOK)
MOK->unsetIsKill();
int UIdx = ValLREndInst->findRegisterUseOperand(IntB.reg, true);
if (UIdx != -1)
ValLREndInst->getOperand(UIdx).unsetIsKill();
// Finally, delete the copy instruction.
RemoveMachineInstrFromMaps(CopyMI);

49
llvm/lib/CodeGen/VirtRegMap.cpp
View File

@ -754,10 +754,11 @@ void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM,
// necessary.
bool WasKill = false;
if (SSMI) {
MachineOperand *MOK = SSMI->findRegisterUseOperand(PhysReg, true);
if (MOK) {
WasKill = MOK->isKill();
MOK->unsetIsKill();
int UIdx = SSMI->findRegisterUseOperand(PhysReg, true);
if (UIdx != -1) {
MachineOperand &MOK = SSMI->getOperand(UIdx);
WasKill = MOK.isKill();
MOK.unsetIsKill();
}
}
if (ti == -1) {
@ -840,17 +841,20 @@ void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM,
// necessary.
bool WasKill = false;
if (SSMI) {
MachineOperand *MOK = SSMI->findRegisterUseOperand(PhysReg, true);
if (MOK) {
WasKill = MOK->isKill();
MOK->unsetIsKill();
int UIdx = SSMI->findRegisterUseOperand(PhysReg, true);
if (UIdx != -1) {
MachineOperand &MOK = SSMI->getOperand(UIdx);
WasKill = MOK.isKill();
MOK.unsetIsKill();
}
}
MachineInstr *CopyMI = prior(MII);
if (WasKill) {
// Transfer kill to the next use.
MachineOperand *MOU = CopyMI->findRegisterUseOperand(PhysReg);
MOU->setIsKill();
int UIdx = CopyMI->findRegisterUseOperand(PhysReg);
assert(UIdx != -1);
MachineOperand &MOU = CopyMI->getOperand(UIdx);
MOU.setIsKill();
}
Spills.addLastUse(PhysReg, CopyMI);
@ -945,18 +949,25 @@ void LocalSpiller::RewriteMBB(MachineBasicBlock &MBB, VirtRegMap &VRM,
// extended. Remove its kill.
bool WasKill = false;
if (SSMI) {
MachineOperand *MOK = SSMI->findRegisterUseOperand(InReg, true);
if (MOK) {
WasKill = MOK->isKill();
MOK->unsetIsKill();
int UIdx = SSMI->findRegisterUseOperand(InReg, true);
if (UIdx != -1) {
MachineOperand &MOK = SSMI->getOperand(UIdx);
WasKill = MOK.isKill();
MOK.unsetIsKill();
}
}
if (NextMII != MBB.end()) {
// If NextMII uses InReg (must be the copy?), mark it killed.
MachineOperand *MOU = NextMII->findRegisterUseOperand(InReg);
if (MOU) {
if (WasKill)
MOU->setIsKill();
// If NextMII uses InReg and the use is not a two address
// operand, mark it killed.
int UIdx = NextMII->findRegisterUseOperand(InReg);
if (UIdx != -1) {
MachineOperand &MOU = NextMII->getOperand(UIdx);
if (WasKill) {
const TargetInstrDescriptor *NTID =
NextMII->getInstrDescriptor();
if (NTID->getOperandConstraint(UIdx, TOI::TIED_TO) == -1)
MOU.setIsKill();
}
Spills.addLastUse(InReg, &(*NextMII));
}
}