[llvm-branch-commits] [llvm-branch] r109308 - in /llvm/branches/Apple/williamson/lib/Target/ARM: ARMISelLowering.cpp ARMISelLowering.cpp.orig

[Daniel Dunbar]

Author: ddunbar
Date: Fri Jul 23 20:02:08 2010
New Revision: 109308

URL: http://llvm.org/viewvc/llvm-project?rev=109308&view=rev
Log:
Merge r109293:
--
Author: Jim Grosbach <grosbach at apple.com>
Date:   Fri Jul 23 23:50:35 2010 +0000

    Use the appropriate register class for an i32 when adding ARM::LR to the
    function live in set. This will give us tGPR for Thumb1 and GPR otherwise,
    so the copy will be spillable. rdar://8224931

Added:
    llvm/branches/Apple/williamson/lib/Target/ARM/ARMISelLowering.cpp.orig
      - copied, changed from r109307, llvm/branches/Apple/williamson/lib/Target/ARM/ARMISelLowering.cpp
Modified:
    llvm/branches/Apple/williamson/lib/Target/ARM/ARMISelLowering.cpp

Modified: llvm/branches/Apple/williamson/lib/Target/ARM/ARMISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/williamson/lib/Target/ARM/ARMISelLowering.cpp?rev=109308&r1=109307&r2=109308&view=diff
==============================================================================
--- llvm/branches/Apple/williamson/lib/Target/ARM/ARMISelLowering.cpp (original)
+++ llvm/branches/Apple/williamson/lib/Target/ARM/ARMISelLowering.cpp Fri Jul 23 20:02:08 2010
@@ -2612,7 +2612,7 @@
   }
 
   // Return LR, which contains the return address. Mark it an implicit live-in.
-  unsigned Reg = MF.addLiveIn(ARM::LR, ARM::GPRRegisterClass); 
+  unsigned Reg = MF.addLiveIn(ARM::LR, getRegClassFor(MVT::i32));
   return DAG.getCopyFromReg(DAG.getEntryNode(), dl, Reg, VT);
 }
 

Copied: llvm/branches/Apple/williamson/lib/Target/ARM/ARMISelLowering.cpp.orig (from r109307, llvm/branches/Apple/williamson/lib/Target/ARM/ARMISelLowering.cpp)
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/williamson/lib/Target/ARM/ARMISelLowering.cpp.orig?p2=llvm/branches/Apple/williamson/lib/Target/ARM/ARMISelLowering.cpp.orig&p1=llvm/branches/Apple/williamson/lib/Target/ARM/ARMISelLowering.cpp&r1=109307&r2=109308&rev=109308&view=diff
==============================================================================
    (empty)