[llvm-branch-commits] [llvm-branch] r88926 - in /llvm/branches/Apple/Leela: lib/Target/ARM/ARMBaseInstrInfo.cpp test/CodeGen/Thumb2/thumb2-tbh.ll

[Jim Grosbach]

Author: grosbach
Date: Mon Nov 16 11:55:26 2009
New Revision: 88926

URL: http://llvm.org/viewvc/llvm-project?rev=88926&view=rev
Log:
merge 88873 88817

Modified:
    llvm/branches/Apple/Leela/lib/Target/ARM/ARMBaseInstrInfo.cpp
    llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-tbh.ll

Modified: llvm/branches/Apple/Leela/lib/Target/ARM/ARMBaseInstrInfo.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/lib/Target/ARM/ARMBaseInstrInfo.cpp?rev=88926&r1=88925&r2=88926&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/lib/Target/ARM/ARMBaseInstrInfo.cpp (original)
+++ llvm/branches/Apple/Leela/lib/Target/ARM/ARMBaseInstrInfo.cpp Mon Nov 16 11:55:26 2009
@@ -740,8 +740,7 @@
     // FIXME: Neon instructions should support predicates
     if (Align >= 16
         && (getRegisterInfo().needsStackRealignment(MF))) {
-      BuildMI(MBB, I, DL, get(ARM::VLD1q64))
-        .addReg(DestReg)
+      BuildMI(MBB, I, DL, get(ARM::VLD1q64), DestReg)
         .addFrameIndex(FI).addImm(0).addImm(0).addImm(128).addMemOperand(MMO);
     } else {
       BuildMI(MBB, I, DL, get(ARM::VLDRQ), DestReg).addFrameIndex(FI).addImm(0).

Modified: llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-tbh.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-tbh.ll?rev=88926&r1=88925&r2=88926&view=diff

==============================================================================
--- llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-tbh.ll (original)
+++ llvm/branches/Apple/Leela/test/CodeGen/Thumb2/thumb2-tbh.ll Mon Nov 16 11:55:26 2009
@@ -3,8 +3,6 @@
 ; Thumb2 target should reorder the bb's in order to use tbb / tbh.
 ; XFAIL: *
 
-; XFAIL: *
-
 	%struct.R_flstr = type { i32, i32, i8* }
 	%struct._T_tstr = type { i32, %struct.R_flstr*, %struct._T_tstr* }
 @_C_nextcmd = external global i32		; <i32*> [#uses=3]