[llvm-commits] [llvm] r165871 - in /llvm/trunk: lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/select.ll

[Benjamin Kramer]

Author: d0k
Date: Sat Oct 13 07:50:19 2012
New Revision: 165871

URL: http://llvm.org/viewvc/llvm-project?rev=165871&view=rev
Log:
X86: Fix accidentally swapped operands.

Modified:
    llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
    llvm/trunk/test/CodeGen/X86/select.ll

Modified: llvm/trunk/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/lib/Target/X86/X86ISelLowering.cpp?rev=165871&r1=165870&r2=165871&view=diff
==============================================================================
--- llvm/trunk/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/trunk/lib/Target/X86/X86ISelLowering.cpp Sat Oct 13 07:50:19 2012
@@ -9158,7 +9158,7 @@
         // Blacklist CopyFromReg to avoid partial register stalls.
         T1.getOpcode() != ISD::CopyFromReg && T2.getOpcode()!=ISD::CopyFromReg){
       SDVTList VTs = DAG.getVTList(T1.getValueType(), MVT::Glue);
-      SDValue Cmov = DAG.getNode(X86ISD::CMOV, DL, VTs, T1, T2, CC, Cond);
+      SDValue Cmov = DAG.getNode(X86ISD::CMOV, DL, VTs, T2, T1, CC, Cond);
       return DAG.getNode(ISD::TRUNCATE, DL, Op.getValueType(), Cmov);
     }
   }

Modified: llvm/trunk/test/CodeGen/X86/select.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/CodeGen/X86/select.ll?rev=165871&r1=165870&r2=165871&view=diff
==============================================================================
--- llvm/trunk/test/CodeGen/X86/select.ll (original)
+++ llvm/trunk/test/CodeGen/X86/select.ll Sat Oct 13 07:50:19 2012
@@ -350,10 +350,10 @@
   %sel = select i1 %cmp, i8 %a, i8 %b
   ret i8 %sel
 ; CHECK: test18:
-; CHECK: cmpl $15
-; CHECK: cmovll
+; CHECK: cmpl $15, %edi
+; CHECK: cmovgel %edx
 
 ; ATOM: test18:
-; ATOM: cmpl $15
-; ATOM: cmovll
+; ATOM: cmpl $15, %edi
+; ATOM: cmovgel %edx
 }