Index: llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp =================================================================== --- llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp +++ llvm/lib/CodeGen/SelectionDAG/LegalizeTypes.cpp @@ -14,8 +14,12 @@ //===----------------------------------------------------------------------===// #include "LegalizeTypes.h" +#include "SDNodeDbgValue.h" #include "llvm/ADT/SetVector.h" +#include "llvm/CodeGen/MachineFunction.h" +#include "llvm/CodeGen/MachineModuleInfo.h" #include "llvm/IR/CallingConv.h" +#include "llvm/IR/DIBuilder.h" #include "llvm/IR/DataLayout.h" #include "llvm/Support/CommandLine.h" #include "llvm/Support/ErrorHandling.h" @@ -822,6 +826,28 @@ Hi = Entry.second; } +/// Transfer SDDbgValues. +static void transferDbgValues(SelectionDAG &DAG, DIBuilder &DIB, SDValue From, + SDValue To, unsigned OffsetInBits) { + SDNode *FromNode = From.getNode(); + SDNode *ToNode = To.getNode(); + assert(FromNode != ToNode); + + for (SDDbgValue *Dbg : DAG.GetDbgValues(FromNode)) { + if (Dbg->getKind() == SDDbgValue::SDNODE) { + auto *Var = cast(Dbg->getVariable()); + DIExpression *Fragment = DIB.createFragmentExpression( + OffsetInBits, To.getValueSizeInBits(), + cast_or_null(Dbg->getExpression())); + SDDbgValue *Clone = DAG.getDbgValue(Var, &*Fragment, ToNode, + To.getResNo(), Dbg->isIndirect(), + Dbg->getDebugLoc(), Dbg->getOrder()); + Dbg->setIsInvalidated(); + DAG.AddDbgValue(Clone, ToNode, false); + } + } +} + void DAGTypeLegalizer::SetExpandedInteger(SDValue Op, SDValue Lo, SDValue Hi) { assert(Lo.getValueType() == @@ -832,6 +858,12 @@ AnalyzeNewValue(Lo); AnalyzeNewValue(Hi); + // Transfer debug values. + const Module *M = DAG.getMachineFunction().getMMI().getModule(); + DIBuilder DIB(*const_cast(M)); + transferDbgValues(DAG, DIB, Op, Lo, 0); + transferDbgValues(DAG, DIB, Op, Hi, Lo.getValueSizeInBits()); + // Remember that this is the result of the node. std::pair &Entry = ExpandedIntegers[Op]; assert(!Entry.first.getNode() && "Node already expanded"); Index: llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp =================================================================== --- llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp +++ llvm/lib/CodeGen/SelectionDAG/SelectionDAG.cpp @@ -7337,9 +7337,9 @@ Dbg->getResNo() == From.getResNo() && !Dbg->isInvalidated()) { assert(FromNode != ToNode && "Should not transfer Debug Values intranode"); - SDDbgValue *Clone = getDbgValue(Dbg->getVariable(), Dbg->getExpression(), - ToNode, To.getResNo(), Dbg->isIndirect(), - Dbg->getDebugLoc(), Dbg->getOrder()); + SDDbgValue *Clone = getDbgValue( + Dbg->getVariable(), Dbg->getExpression(), ToNode, Dbg->getResNo(), + Dbg->isIndirect(), Dbg->getDebugLoc(), Dbg->getOrder()); ClonedDVs.push_back(Clone); Dbg->setIsInvalidated(); } Index: llvm/test/DebugInfo/MSP430/lit.local.cfg =================================================================== --- /dev/null +++ llvm/test/DebugInfo/MSP430/lit.local.cfg @@ -0,0 +1,2 @@ +if not 'MSP430' in config.root.targets: + config.unsupported = True Index: llvm/test/DebugInfo/MSP430/sdagsplit-1.ll =================================================================== --- /dev/null +++ llvm/test/DebugInfo/MSP430/sdagsplit-1.ll @@ -0,0 +1,71 @@ +; RUN: llc %s -stop-after=livedebugvars -o %t +; RUN: cat %t | FileCheck %s +; +; Test that we can emit debug info for large values that are split +; up across multiple registers by the SelectionDAG type legalizer. +; +; // Compile with -O1 -m32. +; long long foo (long long a, long long b) +; { +; long long res = b+1; +; if ( a == b ) +; return res; +; return 0; +; } +; +; CHECK: bb.0.entry: +; CHECK: DBG_VALUE debug-use {{.*}}, debug-use _, !13, {{.*}}, debug-location !17 +; CHECK: DBG_VALUE debug-use {{.*}}, debug-use _, !13, {{.*}}, debug-location !17 +; CHECK: DBG_VALUE debug-use {{.*}}, debug-use _, !13, {{.*}}, debug-location !17 +; CHECK: DBG_VALUE debug-use {{.*}}, debug-use _, !13, {{.*}}, debug-location !17 + +; ModuleID = 'sdagsplit-1.c' +target datalayout = "e-m:e-p:16:16-i32:16-i64:16-f32:16-f64:16-a:8-n8:16-S16" +target triple = "msp430" + +; Function Attrs: nounwind readnone +define i64 @foo(i64 %a, i64 %b) local_unnamed_addr #0 !dbg !7 { +entry: + tail call void @llvm.dbg.value(metadata i64 %a, metadata !12, metadata !15), !dbg !16 + tail call void @llvm.dbg.value(metadata i64 %b, metadata !13, metadata !15), !dbg !17 + tail call void @llvm.dbg.value(metadata i64 %add, metadata !14, metadata !15), !dbg !18 + %cmp = icmp eq i64 %a, %b, !dbg !19 + %add = add nsw i64 %b, 1, !dbg !21 + %retval.0 = select i1 %cmp, i64 %add, i64 0, !dbg !22 + ret i64 %retval.0, !dbg !23 +} + +; Function Attrs: nounwind readnone speculatable +declare void @llvm.dbg.value(metadata, metadata, metadata) #1 + +attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "unsafe-fp-math"="false" "use-soft-float"="false" } +attributes #1 = { nounwind readnone speculatable } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!3, !4, !5} +!llvm.ident = !{!6} + +!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 6.0.0 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2) +!1 = !DIFile(filename: "sdagsplit-1.c", directory: "/MSP430") +!2 = !{} +!3 = !{i32 2, !"Dwarf Version", i32 2} +!4 = !{i32 2, !"Debug Info Version", i32 3} +!5 = !{i32 1, !"wchar_size", i32 2} +!6 = !{!"clang version 6.0.0 "} +!7 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 2, type: !8, isLocal: false, isDefinition: true, scopeLine: 3, flags: DIFlagPrototyped, isOptimized: true, unit: !0, variables: !11) +!8 = !DISubroutineType(types: !9) +!9 = !{!10, !10, !10} +!10 = !DIBasicType(name: "long long int", size: 64, encoding: DW_ATE_signed) +!11 = !{!12, !13, !14} +!12 = !DILocalVariable(name: "a", arg: 1, scope: !7, file: !1, line: 2, type: !10) +!13 = !DILocalVariable(name: "b", arg: 2, scope: !7, file: !1, line: 2, type: !10) +!14 = !DILocalVariable(name: "res", scope: !7, file: !1, line: 4, type: !10) +!15 = !DIExpression() +!16 = !DILocation(line: 2, column: 26, scope: !7) +!17 = !DILocation(line: 2, column: 39, scope: !7) +!18 = !DILocation(line: 4, column: 12, scope: !7) +!19 = !DILocation(line: 5, column: 9, scope: !20) +!20 = distinct !DILexicalBlock(scope: !7, file: !1, line: 5, column: 7) +!21 = !DILocation(line: 4, column: 19, scope: !7) +!22 = !DILocation(line: 5, column: 7, scope: !7) +!23 = !DILocation(line: 8, column: 1, scope: !7) Index: llvm/test/DebugInfo/X86/sdagsplit-1.ll =================================================================== --- /dev/null +++ llvm/test/DebugInfo/X86/sdagsplit-1.ll @@ -0,0 +1,73 @@ +; RUN: %llc_dwarf -filetype=obj < %s | llvm-dwarfdump - | FileCheck %s +; +; Test that we can emit debug info for large values that are split +; up across multiple registers by the SelectionDAG type legalizer. +; +; // Compile with -O1 -m32. +; long long foo (long long a, long long b) +; { +; long long res = b+1; +; if ( a == b ) +; return res; +; return 0; +; } +; +; CHECK: DW_AT_location [DW_FORM_data4] ([[LOC:.*]]) +; CHECK-NEXT: DW_AT_name {{.*}}"res" +; CHECK: .debug_loc +; CHECK: [[LOC]]: +; eax, piece 0x00000004, edx, piece 0x00000004 +; CHECK: Location description: 50 93 04 52 93 04 + +; ModuleID = 'sdagsplit-1.c' +target datalayout = "e-m:e-p:32:32-f64:32:64-f80:32-n8:16:32-S128" +target triple = "i386" + +; Function Attrs: nounwind readnone +define i64 @foo(i64 %a, i64 %b) local_unnamed_addr #0 !dbg !8 { +entry: + tail call void @llvm.dbg.value(metadata i64 %a, metadata !13, metadata !16), !dbg !17 + tail call void @llvm.dbg.value(metadata i64 %b, metadata !14, metadata !16), !dbg !18 + tail call void @llvm.dbg.value(metadata i64 %add, metadata !15, metadata !16), !dbg !19 + %cmp = icmp eq i64 %a, %b, !dbg !20 + %add = add nsw i64 %b, 1, !dbg !22 + %retval.0 = select i1 %cmp, i64 %add, i64 0, !dbg !23 + ret i64 %retval.0, !dbg !24 +} + +; Function Attrs: nounwind readnone speculatable +declare void @llvm.dbg.value(metadata, metadata, metadata) #1 + +attributes #0 = { nounwind readnone "correctly-rounded-divide-sqrt-fp-math"="false" "disable-tail-calls"="false" "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-jump-tables"="false" "no-nans-fp-math"="false" "no-signed-zeros-fp-math"="false" "no-trapping-math"="false" "stack-protector-buffer-size"="8" "target-cpu"="pentium4" "target-featur +es"="+fxsr,+mmx,+sse,+sse2,+x87" "unsafe-fp-math"="false" "use-soft-float"="false" } +attributes #1 = { nounwind readnone speculatable } + +!llvm.dbg.cu = !{!0} +!llvm.module.flags = !{!3, !4, !5, !6} +!llvm.ident = !{!7} + +!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 6.0.0 ", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2) +!1 = !DIFile(filename: "sdagsplit-1.c", directory: "/X86") +!2 = !{} +!3 = !{i32 1, !"NumRegisterParameters", i32 0} +!4 = !{i32 2, !"Dwarf Version", i32 2} +!5 = !{i32 2, !"Debug Info Version", i32 3} +!6 = !{i32 1, !"wchar_size", i32 4} +!7 = !{!"clang version 6.0.0 "} +!8 = distinct !DISubprogram(name: "foo", scope: !1, file: !1, line: 2, type: !9, isLocal: false, isDefinition: true, scopeLine: 3, flags: DIFlagPrototyped, isOptimized: true, unit: !0, variables: !12) +!9 = !DISubroutineType(types: !10) +!10 = !{!11, !11, !11} +!11 = !DIBasicType(name: "long long int", size: 64, encoding: DW_ATE_signed) +!12 = !{!13, !14, !15} +!13 = !DILocalVariable(name: "a", arg: 1, scope: !8, file: !1, line: 2, type: !11) +!14 = !DILocalVariable(name: "b", arg: 2, scope: !8, file: !1, line: 2, type: !11) +!15 = !DILocalVariable(name: "res", scope: !8, file: !1, line: 4, type: !11) +!16 = !DIExpression() +!17 = !DILocation(line: 2, column: 26, scope: !8) +!18 = !DILocation(line: 2, column: 39, scope: !8) +!19 = !DILocation(line: 4, column: 12, scope: !8) +!20 = !DILocation(line: 5, column: 9, scope: !21) +!21 = distinct !DILexicalBlock(scope: !8, file: !1, line: 5, column: 7) +!22 = !DILocation(line: 4, column: 19, scope: !8) +!23 = !DILocation(line: 5, column: 7, scope: !8) +!24 = !DILocation(line: 8, column: 1, scope: !8)