1
0
mirror of https://github.com/RPCS3/llvm-mirror.git synced 2024-10-20 19:42:54 +02:00

Fix a bug introduced by r94490 where it created a X86ISD::CMP whose output type is different from its inputs.

This fixes PR6146.

llvm-svn: 94731
This commit is contained in:
Evan Cheng 2010-01-28 01:57:22 +00:00
parent 5051cd2c50
commit 7e26fdaa78
2 changed files with 49 additions and 8 deletions

View File

@ -6044,7 +6044,7 @@ SDValue X86TargetLowering::LowerSELECT(SDValue Op, SelectionDAG &DAG) {
N2C && N2C->isNullValue() && N2C && N2C->isNullValue() &&
RHSC && RHSC->isNullValue()) { RHSC && RHSC->isNullValue()) {
SDValue CmpOp0 = Cmp.getOperand(0); SDValue CmpOp0 = Cmp.getOperand(0);
Cmp = DAG.getNode(X86ISD::CMP, dl, Op.getValueType(), Cmp = DAG.getNode(X86ISD::CMP, dl, CmpOp0.getValueType(),
CmpOp0, DAG.getConstant(1, CmpOp0.getValueType())); CmpOp0, DAG.getConstant(1, CmpOp0.getValueType()));
return DAG.getNode(X86ISD::SETCC_CARRY, dl, Op.getValueType(), return DAG.getNode(X86ISD::SETCC_CARRY, dl, Op.getValueType(),
DAG.getConstant(X86::COND_B, MVT::i8), Cmp); DAG.getConstant(X86::COND_B, MVT::i8), Cmp);

View File

@ -1,11 +1,17 @@
; RUN: llc < %s -march=x86 | FileCheck %s ; RUN: llc < %s -march=x86 | FileCheck %s -check-prefix=32
; RUN: llc < %s -march=x86-64 | FileCheck %s -check-prefix=64
; rdar://7573216 ; rdar://7573216
; PR6146
define i32 @t1(i32 %x) nounwind readnone ssp { define i32 @t1(i32 %x) nounwind readnone ssp {
entry: entry:
; CHECK: t1: ; 32: t1:
; CHECK: cmpl $1 ; 32: cmpl $1
; CHECK: sbbl ; 32: sbbl
; 64: t1:
; 64: cmpl $1
; 64: sbbl
%0 = icmp eq i32 %x, 0 %0 = icmp eq i32 %x, 0
%iftmp.0.0 = select i1 %0, i32 -1, i32 0 %iftmp.0.0 = select i1 %0, i32 -1, i32 0
ret i32 %iftmp.0.0 ret i32 %iftmp.0.0
@ -13,10 +19,45 @@ entry:
define i32 @t2(i32 %x) nounwind readnone ssp { define i32 @t2(i32 %x) nounwind readnone ssp {
entry: entry:
; CHECK: t2: ; 32: t2:
; CHECK: cmpl $1 ; 32: cmpl $1
; CHECK: sbbl ; 32: sbbl
; 64: t2:
; 64: cmpl $1
; 64: sbbl
%0 = icmp eq i32 %x, 0 %0 = icmp eq i32 %x, 0
%iftmp.0.0 = sext i1 %0 to i32 %iftmp.0.0 = sext i1 %0 to i32
ret i32 %iftmp.0.0 ret i32 %iftmp.0.0
} }
%struct.zbookmark = type { i64, i64 }
%struct.zstream = type { }
define i32 @t3() nounwind readonly {
entry:
; 32: t3:
; 32: cmpl $1
; 32: sbbl
; 32: cmpl
; 32: xorl
; 64: t3:
; 64: cmpl $1
; 64: sbbl
; 64: cmpl
; 64: sbbq
%not.tobool = icmp eq i32 undef, 0 ; <i1> [#uses=2]
%cond = sext i1 %not.tobool to i32 ; <i32> [#uses=1]
%conv = sext i1 %not.tobool to i64 ; <i64> [#uses=1]
%add13 = add i64 0, %conv ; <i64> [#uses=1]
%cmp = icmp ult i64 undef, %add13 ; <i1> [#uses=1]
br i1 %cmp, label %if.then, label %if.end
if.then: ; preds = %entry
br label %if.end
if.end: ; preds = %if.then, %entry
%xor27 = xor i32 undef, %cond ; <i32> [#uses=0]
ret i32 0
}