From a7c9deaa2b1df30808db376bdfcba7f2e54e59d1 Mon Sep 17 00:00:00 2001 From: Lang Hames Date: Thu, 14 May 2009 04:26:30 +0000 Subject: [PATCH] Fix for PR4124. Make TwoAddressFormPass::FindLastUseInMBB return the real last use. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@71769 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/TwoAddressInstructionPass.cpp | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/lib/CodeGen/TwoAddressInstructionPass.cpp b/lib/CodeGen/TwoAddressInstructionPass.cpp index 2ec0c712222..6282a4ab554 100644 --- a/lib/CodeGen/TwoAddressInstructionPass.cpp +++ b/lib/CodeGen/TwoAddressInstructionPass.cpp @@ -316,7 +316,7 @@ bool TwoAddressInstructionPass::NoUseAfterLastDef(unsigned Reg, MachineInstr *TwoAddressInstructionPass::FindLastUseInMBB(unsigned Reg, MachineBasicBlock *MBB, unsigned Dist) { - unsigned LastUseDist = Dist; + unsigned LastUseDist = 0; MachineInstr *LastUse = 0; for (MachineRegisterInfo::reg_iterator I = MRI->reg_begin(Reg), E = MRI->reg_end(); I != E; ++I) { @@ -327,7 +327,10 @@ MachineInstr *TwoAddressInstructionPass::FindLastUseInMBB(unsigned Reg, DenseMap::iterator DI = DistanceMap.find(MI); if (DI == DistanceMap.end()) continue; - if (MO.isUse() && DI->second < LastUseDist) { + if (DI->second >= Dist) + continue; + + if (MO.isUse() && DI->second > LastUseDist) { LastUse = DI->first; LastUseDist = DI->second; } -- 2.34.1