Since I can't reproduce the failures from 131261, re-trying with a

simplified version.  <rdar://problem/9298790>

llvm-svn: 131274
This commit is contained in:
Stuart Hastings 2011-05-13 00:51:54 +00:00
parent 52b0ffd9c6
commit aa02c0847d
2 changed files with 16 additions and 9 deletions

View File

@ -3535,9 +3535,13 @@ void SelectionDAGLegalize::ExpandNode(SDNode *Node,
Tmp2.getOperand(0), Tmp2.getOperand(1), Tmp2.getOperand(0), Tmp2.getOperand(1),
Node->getOperand(2)); Node->getOperand(2));
} else { } else {
// We test only the i1 bit. Skip the AND if UNDEF.
Tmp3 = (Tmp2.getOpcode() == ISD::UNDEF) ? Tmp2 :
DAG.getNode(ISD::AND, dl, Tmp2.getValueType(), Tmp2,
DAG.getConstant(1, Tmp2.getValueType()));
Tmp1 = DAG.getNode(ISD::BR_CC, dl, MVT::Other, Tmp1, Tmp1 = DAG.getNode(ISD::BR_CC, dl, MVT::Other, Tmp1,
DAG.getCondCode(ISD::SETNE), Tmp2, DAG.getCondCode(ISD::SETNE), Tmp3,
DAG.getConstant(0, Tmp2.getValueType()), DAG.getConstant(0, Tmp3.getValueType()),
Node->getOperand(2)); Node->getOperand(2));
} }
Results.push_back(Tmp1); Results.push_back(Tmp1);

View File

@ -3,26 +3,29 @@
declare double @floor(double) nounwind readnone declare double @floor(double) nounwind readnone
define void @t(i1 %a, double %b) { define void @t(i32 %c, double %b) {
entry: entry:
br i1 %a, label %bb3, label %bb1 %cmp1 = icmp ne i32 %c, 0
br i1 %cmp1, label %bb3, label %bb1
bb1: ; preds = %entry bb1: ; preds = %entry
unreachable unreachable
bb3: ; preds = %entry bb3: ; preds = %entry
br i1 %a, label %bb7, label %bb5 %cmp2 = icmp ne i32 %c, 0
br i1 %cmp2, label %bb7, label %bb5
bb5: ; preds = %bb3 bb5: ; preds = %bb3
unreachable unreachable
bb7: ; preds = %bb3 bb7: ; preds = %bb3
br i1 %a, label %bb11, label %bb9 %cmp3 = icmp ne i32 %c, 0
br i1 %cmp3, label %bb11, label %bb9
bb9: ; preds = %bb7 bb9: ; preds = %bb7
; CHECK: cmp r0, #0 ; CHECK: cmp r0, #0
; CHECK: cmp r0, #0 ; CHECK: cmp r0, #0
; CHECK-NEXT: cbnz ; CHECK-NEXT: cbnz
%0 = tail call double @floor(double %b) nounwind readnone ; <double> [#uses=0] %0 = tail call double @floor(double %b) nounwind readnone ; <double> [#uses=0]
br label %bb11 br label %bb11