From ab847242976b8e7c495308f8b771ae5d0db8b340 Mon Sep 17 00:00:00 2001 From: Evan Cheng Date: Tue, 6 Nov 2007 08:50:44 +0000 Subject: [PATCH] Fix a bug where a def use operand isn't being detected as a sub-register use. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@43763 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/CodeGen/LiveIntervalAnalysis.cpp | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) diff --git a/lib/CodeGen/LiveIntervalAnalysis.cpp b/lib/CodeGen/LiveIntervalAnalysis.cpp index 92c26346242..9301c28015c 100644 --- a/lib/CodeGen/LiveIntervalAnalysis.cpp +++ b/lib/CodeGen/LiveIntervalAnalysis.cpp @@ -19,7 +19,6 @@ #include "llvm/CodeGen/LiveIntervalAnalysis.h" #include "VirtRegMap.h" #include "llvm/Value.h" -#include "llvm/Analysis/LoopInfo.h" #include "llvm/CodeGen/LiveVariables.h" #include "llvm/CodeGen/MachineFrameInfo.h" #include "llvm/CodeGen/MachineInstr.h" @@ -57,7 +56,6 @@ void LiveIntervals::getAnalysisUsage(AnalysisUsage &AU) const { AU.addPreservedID(PHIEliminationID); AU.addRequiredID(PHIEliminationID); AU.addRequiredID(TwoAddressInstructionPassID); - AU.addRequired(); MachineFunctionPass::getAnalysisUsage(AU); } @@ -378,8 +376,13 @@ addIntervalsForSpills(const LiveInterval &li, VirtRegMap &vrm, unsigned reg) { bool HasUse = mop.isUse(); bool HasDef = mop.isDef(); for (unsigned j = i+1, e = MI->getNumOperands(); j != e; ++j) { - if (MI->getOperand(j).isRegister() && - MI->getOperand(j).getReg() == li.reg) { + if (!MI->getOperand(j).isRegister()) + continue; + unsigned RegJ = MI->getOperand(j).getReg(); + if (RegJ != 0 && MRegisterInfo::isVirtualRegister(RegJ) && + RegMap->isSubRegister(RegJ)) + RegJ = RegMap->getSuperRegister(RegJ); + if (RegJ == li.reg) { MI->getOperand(j).setReg(NewVReg); HasUse |= MI->getOperand(j).isUse(); HasDef |= MI->getOperand(j).isDef(); -- 2.34.1