diff --git a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp index 97ec5d6b2d7f8ec5dab024417f951d72feb3c222..91f462d2d4146a7253b58ac5e561db526dd19c65 100644 --- a/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ b/llvm/lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -1834,12 +1834,6 @@ SDValue DAGCombiner::visitADDLike(SDValue N0, SDValue N1, SDNode *LocReference) } } - // (add X, (adde Y, 0, Carry)) -> (adde X, Y, Carry) - if (N1.getOpcode() == ISD::ADDE && N1->hasOneUse() && - isNullConstant(N1.getOperand(1))) - return DAG.getNode(ISD::ADDE, DL, DAG.getVTList(VT, MVT::Glue), - N0, N1->getOperand(0), N1->getOperand(2)); - return SDValue(); } diff --git a/llvm/test/CodeGen/X86/adde-carry.ll b/llvm/test/CodeGen/X86/adde-carry.ll index 62e7e7f8124ad6139cd65f608a97b04a6c8293fc..e111f683dd318e6722c16f6eab17c1cf941f293e 100644 --- a/llvm/test/CodeGen/X86/adde-carry.ll +++ b/llvm/test/CodeGen/X86/adde-carry.ll @@ -93,16 +93,17 @@ define %scalar @pr31719(%scalar* nocapture readonly %this, %scalar %arg.b) { ; CHECK-NEXT: sbbq %r10, %r10 ; CHECK-NEXT: andl $1, %r10d ; CHECK-NEXT: addq 8(%rsi), %rcx +; CHECK-NEXT: sbbq %r11, %r11 +; CHECK-NEXT: andl $1, %r11d +; CHECK-NEXT: addq %r10, %rcx +; CHECK-NEXT: adcq $0, %r11 +; CHECK-NEXT: addq 16(%rsi), %r8 ; CHECK-NEXT: sbbq %rax, %rax ; CHECK-NEXT: andl $1, %eax -; CHECK-NEXT: addq %r10, %rcx +; CHECK-NEXT: addq %r11, %r8 ; CHECK-NEXT: adcq $0, %rax -; CHECK-NEXT: addq 16(%rsi), %r8 -; CHECK-NEXT: sbbq %r10, %r10 -; CHECK-NEXT: andl $1, %r10d ; CHECK-NEXT: addq 24(%rsi), %r9 -; CHECK-NEXT: addq %rax, %r8 -; CHECK-NEXT: adcq %r10, %r9 +; CHECK-NEXT: addq %rax, %r9 ; CHECK-NEXT: movq %rdx, (%rdi) ; CHECK-NEXT: movq %rcx, 8(%rdi) ; CHECK-NEXT: movq %r8, 16(%rdi)