[llvm-branch-commits] [llvm-branch] r105846 - in /llvm/branches/Apple/Troughton: ./ lib/Target/ARM/ARMISelLowering.cpp test/CodeGen/ARM/2010-06-11-vmovdrr-bitcast.ll

[Bob Wilson]

Author: bwilson
Date: Fri Jun 11 17:47:06 2010
New Revision: 105846

URL: http://llvm.org/viewvc/llvm-project?rev=105846&view=rev
Log:
--- Merging r105845 into '.':
A    test/CodeGen/ARM/2010-06-11-vmovdrr-bitcast.ll
U    lib/Target/ARM/ARMISelLowering.cpp

Added:
    llvm/branches/Apple/Troughton/test/CodeGen/ARM/2010-06-11-vmovdrr-bitcast.ll
      - copied unchanged from r105845, llvm/trunk/test/CodeGen/ARM/2010-06-11-vmovdrr-bitcast.ll
Modified:
    llvm/branches/Apple/Troughton/   (props changed)
    llvm/branches/Apple/Troughton/lib/Target/ARM/ARMISelLowering.cpp

Propchange: llvm/branches/Apple/Troughton/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Fri Jun 11 17:47:06 2010
@@ -1 +1 @@
-/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105481,105498,105541,105554,105557,105585-105586,105634,105653
+/llvm/trunk:105358,105361,105369,105372,105399,105427,105437,105439,105441,105470,105481,105498,105541,105554,105557,105585-105586,105634,105653,105845

Modified: llvm/branches/Apple/Troughton/lib/Target/ARM/ARMISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Troughton/lib/Target/ARM/ARMISelLowering.cpp?rev=105846&r1=105845&r2=105846&view=diff
==============================================================================
--- llvm/branches/Apple/Troughton/lib/Target/ARM/ARMISelLowering.cpp (original)
+++ llvm/branches/Apple/Troughton/lib/Target/ARM/ARMISelLowering.cpp Fri Jun 11 17:47:06 2010
@@ -2221,7 +2221,8 @@
                              DAG.getConstant(0, MVT::i32));
     SDValue Hi = DAG.getNode(ISD::EXTRACT_ELEMENT, dl, MVT::i32, Op,
                              DAG.getConstant(1, MVT::i32));
-    return DAG.getNode(ARMISD::VMOVDRR, dl, MVT::f64, Lo, Hi);
+    return DAG.getNode(ISD::BIT_CONVERT, dl, DstVT,
+                       DAG.getNode(ARMISD::VMOVDRR, dl, MVT::f64, Lo, Hi));
   }
 
   // Turn f64->i64 into VMOVRRD.