[llvm-branch-commits] [llvm-branch] r106585 - in /llvm/branches/Apple/Troughton: ./ lib/Target/ARM/Thumb1InstrInfo.cpp test/CodeGen/ARM/arm-returnaddr.ll

[Bob Wilson]

Author: bwilson
Date: Tue Jun 22 17:13:50 2010
New Revision: 106585

URL: http://llvm.org/viewvc/llvm-project?rev=106585&view=rev
Log:
--- Merging r106582 into '.':
U    test/CodeGen/ARM/arm-returnaddr.ll
U    lib/Target/ARM/Thumb1InstrInfo.cpp

Modified:
    llvm/branches/Apple/Troughton/   (props changed)
    llvm/branches/Apple/Troughton/lib/Target/ARM/Thumb1InstrInfo.cpp
    llvm/branches/Apple/Troughton/test/CodeGen/ARM/arm-returnaddr.ll

Propchange: llvm/branches/Apple/Troughton/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Jun 22 17:13:50 2010
@@ -1 +1 @@
-/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105473,105481,105498,105541,105554,105557,105585-105586,105634,105653,105665,105669,105677,105745,105749,105774-105775,105836,105845,105862,105938,105959,105965,105969,105982,105990-105991,105997-105998,106004,106015,106021,106024,106027,106030,106051,106057,106146,106149,106152,106155,106157,106164,106199,106203-106204,106227,106229,106289,106291-106292,106309,106312,106314,106318,106321,106324,106333,106336,106342,106345,106483-106484
+/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105473,105481,105498,105541,105554,105557,105585-105586,105634,105653,105665,105669,105677,105745,105749,105774-105775,105836,105845,105862,105938,105959,105965,105969,105982,105990-105991,105997-105998,106004,106015,106021,106024,106027,106030,106051,106057,106146,106149,106152,106155,106157,106164,106199,106203-106204,106227,106229,106289,106291-106292,106309,106312,106314,106318,106321,106324,106333,106336,106342,106345,106483-106484,106582

Modified: llvm/branches/Apple/Troughton/lib/Target/ARM/Thumb1InstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/lib/Target/ARM/Thumb1InstrInfo.cpp?rev=106585&r1=106584&r2=106585&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/lib/Target/ARM/Thumb1InstrInfo.cpp (original)
+++ llvm/branches/Apple/Troughton/lib/Target/ARM/Thumb1InstrInfo.cpp Tue Jun 22 17:13:50 2010
@@ -175,10 +175,10 @@
         isKill = false;
     }
 
-    if (isKill) {
+    if (isKill)
       MBB.addLiveIn(Reg);
-      MIB.addReg(Reg, RegState::Kill);
-    }
+
+    MIB.addReg(Reg, getKillRegState(isKill));
   }
   return true;
 }

Modified: llvm/branches/Apple/Troughton/test/CodeGen/ARM/arm-returnaddr.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/test/CodeGen/ARM/arm-returnaddr.ll?rev=106585&r1=106584&r2=106585&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/test/CodeGen/ARM/arm-returnaddr.ll (original)
+++ llvm/branches/Apple/Troughton/test/CodeGen/ARM/arm-returnaddr.ll Tue Jun 22 17:13:50 2010
@@ -1,11 +1,12 @@
 ; RUN: llc < %s -mtriple=arm-apple-darwin | FileCheck %s
-; RUN: llc < %s -mtriple=thumbv6-apple-darwin
+; RUN: llc < %s -mtriple=thumbv6-apple-darwin | FileCheck %s
 ; rdar://8015977
 ; rdar://8020118
 
 define arm_apcscc i8* @rt0(i32 %x) nounwind readnone {
 entry:
 ; CHECK: rt0:
+; CHECK: {r7, lr}
 ; CHECK: mov r0, lr
   %0 = tail call i8* @llvm.returnaddress(i32 0)
   ret i8* %0
@@ -14,6 +15,7 @@
 define arm_apcscc i8* @rt2() nounwind readnone {
 entry:
 ; CHECK: rt2:
+; CHECK: {r7, lr}
 ; CHECK: ldr r0, [r7]
 ; CHECK: ldr r0, [r0]
 ; CHECK: ldr r0, [r0, #4]