[llvm-branch-commits] [llvm-branch] r104519 - in /llvm/branches/Apple/Hermes: lib/Target/ARM/ARMISelLowering.cpp test/CodeGen/ARM/arm-returnaddr.ll

[Evan Cheng]

Author: evancheng
Date: Mon May 24 13:08:44 2010
New Revision: 104519

URL: http://llvm.org/viewvc/llvm-project?rev=104519&view=rev
Log:
Merge 104518.

Modified:
    llvm/branches/Apple/Hermes/lib/Target/ARM/ARMISelLowering.cpp
    llvm/branches/Apple/Hermes/test/CodeGen/ARM/arm-returnaddr.ll

Modified: llvm/branches/Apple/Hermes/lib/Target/ARM/ARMISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hermes/lib/Target/ARM/ARMISelLowering.cpp?rev=104519&r1=104518&r2=104519&view=diff
==============================================================================
--- llvm/branches/Apple/Hermes/lib/Target/ARM/ARMISelLowering.cpp (original)
+++ llvm/branches/Apple/Hermes/lib/Target/ARM/ARMISelLowering.cpp Mon May 24 13:08:44 2010
@@ -2055,10 +2055,7 @@
   }
 
   // Return LR, which contains the return address. Mark it an implicit live-in.
-  ARMFunctionInfo *AFI = MF.getInfo<ARMFunctionInfo>();
-  TargetRegisterClass *RC = AFI->isThumb1OnlyFunction()
-    ? ARM::tGPRRegisterClass : ARM::GPRRegisterClass;
-  unsigned Reg = MF.addLiveIn(ARM::LR, RC); 
+  unsigned Reg = MF.addLiveIn(ARM::LR, ARM::GPRRegisterClass); 
   return DAG.getCopyFromReg(DAG.getEntryNode(), dl, Reg, VT);
 }
 

Modified: llvm/branches/Apple/Hermes/test/CodeGen/ARM/arm-returnaddr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Hermes/test/CodeGen/ARM/arm-returnaddr.ll?rev=104519&r1=104518&r2=104519&view=diff
==============================================================================
--- llvm/branches/Apple/Hermes/test/CodeGen/ARM/arm-returnaddr.ll (original)
+++ llvm/branches/Apple/Hermes/test/CodeGen/ARM/arm-returnaddr.ll Mon May 24 13:08:44 2010
@@ -1,5 +1,7 @@
 ; RUN: llc < %s -mtriple=arm-apple-darwin | FileCheck %s
+; RUN: llc < %s -mtriple=thumbv6-apple-darwin
 ; rdar://8015977
+; rdar://8020118
 
 define arm_apcscc i8* @rt0(i32 %x) nounwind readnone {
 entry: