Index: lib/CodeGen/SelectionDAG/DAGCombiner.cpp =================================================================== --- lib/CodeGen/SelectionDAG/DAGCombiner.cpp +++ lib/CodeGen/SelectionDAG/DAGCombiner.cpp @@ -4697,9 +4697,9 @@ default: llvm_unreachable("Unhandled SetCC Equivalent!"); case ISD::SETCC: - return DAG.getSetCC(SDLoc(N), VT, LHS, RHS, NotCC); + return DAG.getSetCC(SDLoc(N0), VT, LHS, RHS, NotCC); case ISD::SELECT_CC: - return DAG.getSelectCC(SDLoc(N), LHS, RHS, N0.getOperand(2), + return DAG.getSelectCC(SDLoc(N0), LHS, RHS, N0.getOperand(2), N0.getOperand(3), NotCC); } } Index: test/CodeGen/NVPTX/lower-aggr-copies.ll =================================================================== --- test/CodeGen/NVPTX/lower-aggr-copies.ll +++ test/CodeGen/NVPTX/lower-aggr-copies.ll @@ -113,8 +113,8 @@ ; PTX-LABEL: .visible .func (.param .b64 func_retval0) memmove_caller( ; PTX: ld.param.u64 %rd[[N:[0-9]+]] -; PTX: setp.eq.s64 %p[[NEQ0:[0-9]+]], %rd[[N]], 0 -; PTX: setp.ge.u64 %p[[SRC_GT_THAN_DST:[0-9]+]], %rd{{[0-9]+}}, %rd{{[0-9]+}} +; PTX-DAG: setp.eq.s64 %p[[NEQ0:[0-9]+]], %rd[[N]], 0 +; PTX-DAG: setp.ge.u64 %p[[SRC_GT_THAN_DST:[0-9]+]], %rd{{[0-9]+}}, %rd{{[0-9]+}} ; PTX-NEXT: @%p[[SRC_GT_THAN_DST]] bra LBB[[FORWARD_BB:[0-9_]+]] ; -- this is the backwards copying BB ; PTX: @%p[[NEQ0]] bra LBB[[EXIT:[0-9_]+]] Index: test/CodeGen/X86/avx512-fsel.ll =================================================================== --- test/CodeGen/X86/avx512-fsel.ll +++ test/CodeGen/X86/avx512-fsel.ll @@ -12,22 +12,22 @@ ; CHECK-NEXT: .cfi_def_cfa_offset 16 ; CHECK-NEXT: movb $1, %al ; CHECK-NEXT: vucomiss %xmm1, %xmm0 -; CHECK-NEXT: setnp %cl -; CHECK-NEXT: sete %dl -; CHECK-NEXT: setp %sil -; CHECK-NEXT: setne %dil -; CHECK-NEXT: andb %cl, %dl +; CHECK-DAG: setnp [[REG1:%[^ ]+]] +; CHECK-DAG: sete [[REG2:%[^ ]+]] +; CHECK-DAG: setp [[REG3:%[^ ]+]] +; CHECK-DAG: setne [[REG4:%[^ ]+]] +; CHECK: andb [[REG1]], [[REG2]] ; CHECK-NEXT: ## implicit-def: %R8D -; CHECK-NEXT: movb %dl, %r8b +; CHECK-NEXT: movb [[REG2]], %r8b ; CHECK-NEXT: andl $1, %r8d ; CHECK-NEXT: kmovw %r8d, %k0 -; CHECK-NEXT: orb %sil, %dil +; CHECK-NEXT: orb [[REG3]], [[REG4]] ; CHECK-NEXT: ## implicit-def: %R8D -; CHECK-NEXT: movb %dil, %r8b +; CHECK-NEXT: movb [[REG4]], %r8b ; CHECK-NEXT: andl $1, %r8d ; CHECK-NEXT: kmovw %r8d, %k1 ; CHECK-NEXT: kmovw %k1, %ecx -; CHECK-NEXT: testb $1, %cl +; CHECK-NEXT: testb $1, [[REG3]] ; CHECK-NEXT: movb %al, {{[0-9]+}}(%rsp) ## 1-byte Spill ; CHECK-NEXT: kmovw %k0, {{[0-9]+}}(%rsp) ## 2-byte Spill ; CHECK-NEXT: jne LBB0_1 Index: test/CodeGen/X86/fp128-i128.ll =================================================================== --- test/CodeGen/X86/fp128-i128.ll +++ test/CodeGen/X86/fp128-i128.ll @@ -306,10 +306,10 @@ ret void ; CHECK-LABEL: TestCopySign ; CHECK-NOT: call -; CHECK: callq __subtf3 -; CHECK-NOT: call ; CHECK: callq __gttf2 ; CHECK-NOT: call +; CHECK: callq __subtf3 +; CHECK-NOT: call ; CHECK: andps {{.*}}, %xmm0 ; CHECK: retq } Index: test/CodeGen/X86/xor-combine-debugloc.ll =================================================================== --- /dev/null +++ test/CodeGen/X86/xor-combine-debugloc.ll @@ -0,0 +1,63 @@ +; RUN: llc < %s | FileCheck %s +; +; CHECK: foo:x <- %EDI +; CHECK: foo:y <- %ESI +; CHECK: .loc 1 5 9 +; CHECK-NEXT: cmpl %esi, %edi +; CHECK: .loc 1 5 7 +; CHECK-NEXT: je + +target triple = "x86_64-unknown-linux-gnu" + +; Function Attrs: nounwind uwtable +define i32 @foo(i32 %x, i32 %y) !dbg !4 { +entry: + tail call void @llvm.dbg.value(metadata i32 %x, i64 0, metadata !9, metadata !11), !dbg !12 + tail call void @llvm.dbg.value(metadata i32 %y, i64 0, metadata !10, metadata !11), !dbg !13 + %cmp = icmp ne i32 %x, %y, !dbg !14 + br i1 %cmp, label %if.then, label %if.else, !dbg !16 + +if.then: ; preds = %entry + %call = tail call i32 (...) @bar() #3, !dbg !17 + br label %return, !dbg !18 + +if.else: ; preds = %entry + %call1 = tail call i32 (...) @baz() #3, !dbg !19 + br label %return, !dbg !20 + +return: ; preds = %if.else, %if.then + %retval.0 = phi i32 [ %call, %if.then ], [ %call1, %if.else ] + ret i32 %retval.0, !dbg !21 +} + +declare i32 @bar(...) +declare i32 @baz(...) + +; Function Attrs: nounwind readnone +declare void @llvm.dbg.value(metadata, i64, metadata, metadata) + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!2, !3} + +!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, emissionKind: FullDebug) +!1 = !DIFile(filename: "foo.c", directory: "b/") +!2 = !{i32 2, !"Dwarf Version", i32 4} +!3 = !{i32 2, !"Debug Info Version", i32 3} +!4 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 4, type: !5, isLocal: false, isDefinition: true, scopeLine: 4, flags: DIFlagPrototyped, isOptimized: true, unit: !0, variables: !8) +!5 = !DISubroutineType(types: !6) +!6 = !{!7, !7, !7} +!7 = !DIBasicType(name: "int", size: 32, encoding: DW_ATE_signed) +!8 = !{!9, !10} +!9 = !DILocalVariable(name: "x", arg: 1, scope: !4, file: !1, line: 4, type: !7) +!10 = !DILocalVariable(name: "y", arg: 2, scope: !4, file: !1, line: 4, type: !7) +!11 = !DIExpression() +!12 = !DILocation(line: 4, column: 13, scope: !4) +!13 = !DILocation(line: 4, column: 20, scope: !4) +!14 = !DILocation(line: 5, column: 9, scope: !15) +!15 = distinct !DILexicalBlock(scope: !4, file: !1, line: 5, column: 7) +!16 = !DILocation(line: 5, column: 7, scope: !4) +!17 = !DILocation(line: 6, column: 12, scope: !15) +!18 = !DILocation(line: 6, column: 5, scope: !15) +!19 = !DILocation(line: 8, column: 12, scope: !15) +!20 = !DILocation(line: 8, column: 5, scope: !15) +!21 = !DILocation(line: 9, column: 1, scope: !4)