[llvm-branch-commits] [llvm-branch] r93568 - in /llvm/branches/Apple/Zoidberg: lib/Target/ARM/Thumb1InstrInfo.cpp test/CodeGen/Thumb/2010-01-15-local-alloc-spill-physical.ll

[Jim Grosbach]

Author: grosbach
Date: Fri Jan 15 16:28:39 2010
New Revision: 93568

URL: http://llvm.org/viewvc/llvm-project?rev=93568&view=rev
Log:
merge 93564 93567

Added:
    llvm/branches/Apple/Zoidberg/test/CodeGen/Thumb/2010-01-15-local-alloc-spill-physical.ll
      - copied unchanged from r93567, llvm/trunk/test/CodeGen/Thumb/2010-01-15-local-alloc-spill-physical.ll
Modified:
    llvm/branches/Apple/Zoidberg/lib/Target/ARM/Thumb1InstrInfo.cpp

Modified: llvm/branches/Apple/Zoidberg/lib/Target/ARM/Thumb1InstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/Target/ARM/Thumb1InstrInfo.cpp?rev=93568&r1=93567&r2=93568&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/Target/ARM/Thumb1InstrInfo.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/Target/ARM/Thumb1InstrInfo.cpp Fri Jan 15 16:28:39 2010
@@ -124,7 +124,9 @@
           (TargetRegisterInfo::isPhysicalRegister(SrcReg) &&
            isARMLowRegister(SrcReg))) && "Unknown regclass!");
 
-  if (RC == ARM::tGPRRegisterClass) {
+  if (RC == ARM::tGPRRegisterClass ||
+      (TargetRegisterInfo::isPhysicalRegister(SrcReg) &&
+       isARMLowRegister(SrcReg))) {
     MachineFunction &MF = *MBB.getParent();
     MachineFrameInfo &MFI = *MF.getFrameInfo();
     MachineMemOperand *MMO =
@@ -149,7 +151,9 @@
           (TargetRegisterInfo::isPhysicalRegister(DestReg) &&
            isARMLowRegister(DestReg))) && "Unknown regclass!");
 
-  if (RC == ARM::tGPRRegisterClass) {
+  if (RC == ARM::tGPRRegisterClass ||
+      (TargetRegisterInfo::isPhysicalRegister(DestReg) &&
+       isARMLowRegister(DestReg))) {
     MachineFunction &MF = *MBB.getParent();
     MachineFrameInfo &MFI = *MF.getFrameInfo();
     MachineMemOperand *MMO =