[llvm-commits] [llvm] r131555 - /llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp

[Evan Cheng]

Author: evancheng
Date: Wed May 18 13:59:17 2011
New Revision: 131555

URL: http://llvm.org/viewvc/llvm-project?rev=131555&view=rev
Log:
Revise r131553. Just use the type of the input node and forgo the bitcast. rdar://9449159.

Modified:
    llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp

Modified: llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp?rev=131555&r1=131554&r2=131555&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp Wed May 18 13:59:17 2011
@@ -2693,13 +2693,12 @@
       }
 
       if (True.getNode() && False.getNode()) {
-        EVT VT = Cond.getValueType();
+        EVT VT = Op.getValueType();
         SDValue ARMcc = Cond.getOperand(2);
         SDValue CCR = Cond.getOperand(3);
         SDValue Cmp = duplicateCmp(Cond.getOperand(4), DAG);
-        return DAG.getNode(ISD::BITCAST, dl, Op.getValueType(),
-                           DAG.getNode(ARMISD::CMOV, dl, VT, True, False,
-                                       ARMcc, CCR, Cmp));
+        assert(True.getValueType() == VT);
+        return DAG.getNode(ARMISD::CMOV, dl, VT, True, False, ARMcc, CCR, Cmp);
       }
     }
   }