[llvm-branch-commits] [llvm-branch] r91406 - in /llvm/branches/Apple/Zoidberg: lib/Target/X86/X86ISelLowering.cpp test/CodeGen/X86/setcc.ll

[Evan Cheng]

Author: evancheng
Date: Mon Dec 14 21:09:41 2009
New Revision: 91406

URL: http://llvm.org/viewvc/llvm-project?rev=91406&view=rev
Log:
Merge 91405.

Modified:
    llvm/branches/Apple/Zoidberg/lib/Target/X86/X86ISelLowering.cpp
    llvm/branches/Apple/Zoidberg/test/CodeGen/X86/setcc.ll

Modified: llvm/branches/Apple/Zoidberg/lib/Target/X86/X86ISelLowering.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/lib/Target/X86/X86ISelLowering.cpp?rev=91406&r1=91405&r2=91406&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/lib/Target/X86/X86ISelLowering.cpp (original)
+++ llvm/branches/Apple/Zoidberg/lib/Target/X86/X86ISelLowering.cpp Mon Dec 14 21:09:41 2009
@@ -5737,7 +5737,9 @@
   SDValue Cond = EmitCmp(Op0, Op1, X86CC, DAG);
 
   // Use sbb x, x to materialize carry bit into a GPR.
-  if (X86CC == X86::COND_B) {
+  // FIXME: Temporarily disabled since it breaks self-hosting. It's apparently
+  // miscompiling ARMISelDAGToDAG.cpp.
+  if (0 && !isFP && X86CC == X86::COND_B) {
     return DAG.getNode(ISD::AND, dl, MVT::i8,
                        DAG.getNode(X86ISD::SETCC_CARRY, dl, MVT::i8,
                                    DAG.getConstant(X86CC, MVT::i8), Cond),

Modified: llvm/branches/Apple/Zoidberg/test/CodeGen/X86/setcc.ll
URL: http://llvm.org/viewvc/llvm-project/llvm/branches/Apple/Zoidberg/test/CodeGen/X86/setcc.ll?rev=91406&r1=91405&r2=91406&view=diff

==============================================================================
--- llvm/branches/Apple/Zoidberg/test/CodeGen/X86/setcc.ll (original)
+++ llvm/branches/Apple/Zoidberg/test/CodeGen/X86/setcc.ll Mon Dec 14 21:09:41 2009
@@ -1,4 +1,5 @@
 ; RUN: llc < %s -mtriple=x86_64-apple-darwin | FileCheck %s
+; XFAIL: *
 ; rdar://7329206
 
 ; Use sbb x, x to materialize carry bit in a GPR. The value is either