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

[Evan Cheng]

Author: evancheng
Date: Wed May 18 13:47:27 2011
New Revision: 131553

URL: http://llvm.org/viewvc/llvm-project?rev=131553&view=rev
Log:
Fix an ARMTargetLowering::LowerSELECT bug: legalized result must have same type as input. Sorry test cases only trigger when dag combine is disabled. rdar://9449178

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=131553&r1=131552&r2=131553&view=diff
==============================================================================
--- llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/ARM/ARMISelLowering.cpp Wed May 18 13:47:27 2011
@@ -2697,7 +2697,9 @@
         SDValue ARMcc = Cond.getOperand(2);
         SDValue CCR = Cond.getOperand(3);
         SDValue Cmp = duplicateCmp(Cond.getOperand(4), DAG);
-        return DAG.getNode(ARMISD::CMOV, dl, VT, True, False, ARMcc, CCR, Cmp);
+        return DAG.getNode(ISD::BITCAST, dl, Op.getValueType(),
+                           DAG.getNode(ARMISD::CMOV, dl, VT, True, False,
+                                       ARMcc, CCR, Cmp));
       }
     }
   }