forked from OSchip/llvm-project
[DebugInfo] retainedTypes should not have subprograms
After D80369, the retainedTypes in CU's should not have any subprograms so we should not handle that case when emitting debug info. Differential Revision: https://reviews.llvm.org/D111593
This commit is contained in:
Ellis Hoag
Puyan Lotfi
parent
f5ed223b0f
commit
aa80034ab9
|
|
@ -1101,11 +1101,6 @@ DwarfDebug::getOrCreateDwarfCompileUnit(const DICompileUnit *DIUnit) {
|
|||
NewCU.setSection(Asm->getObjFileLowering().getDwarfInfoSection());
|
||||
}
|
||||
|
||||
// Create DIEs for function declarations used for call site debug info.
|
||||
for (auto Scope : DIUnit->getRetainedTypes())
|
||||
if (auto *SP = dyn_cast_or_null<DISubprogram>(Scope))
|
||||
NewCU.getOrCreateSubprogramDIE(SP);
|
||||
|
||||
CUMap.insert({DIUnit, &NewCU});
|
||||
CUDieMap.insert({&NewCU.getUnitDie(), &NewCU});
|
||||
return NewCU;
|
||||
|
|
|
|||
|
|
@ -21,16 +21,16 @@
|
|||
|
||||
# After w0 is clobbered, we should get an indirect parameter entry value for "f".
|
||||
|
||||
# DWARF-LABEL: DW_TAG_subprogram
|
||||
# DWARF: DW_AT_name ("baz")
|
||||
|
||||
# DWARF-LABEL: DW_TAG_subprogram
|
||||
# DWARF-LABEL: DW_TAG_formal_parameter
|
||||
# DWARF: DW_TAG_subprogram
|
||||
# DWARF: DW_TAG_formal_parameter
|
||||
# DWARF-NEXT: DW_AT_location
|
||||
# DWARF-NEXT: [0x0000000000000000, 0x0000000000000010): DW_OP_breg0 W0+0
|
||||
# DWARF-NEXT: [0x0000000000000010, 0x000000000000001c): DW_OP_entry_value(DW_OP_reg0 W0))
|
||||
# DWARF-NEXT: DW_AT_name ("f")
|
||||
|
||||
# DWARF: DW_TAG_subprogram
|
||||
# DWARF: DW_AT_name ("baz")
|
||||
|
||||
--- |
|
||||
target datalayout = "e-m:o-i64:64-i128:128-n32:64-S128"
|
||||
target triple = "arm64-apple-ios10.0.0"
|
||||
|
|
@ -56,10 +56,9 @@
|
|||
!llvm.module.flags = !{!8, !9, !10, !11}
|
||||
!llvm.ident = !{!12}
|
||||
|
||||
!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None, sysroot: "/")
|
||||
!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None, sysroot: "/")
|
||||
!1 = !DIFile(filename: "indirect.c", directory: "/tmp/fatptr")
|
||||
!2 = !{}
|
||||
!3 = !{!4}
|
||||
!4 = !DISubprogram(name: "baz", scope: !1, file: !1, line: 4, type: !5, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
|
||||
!5 = !DISubroutineType(types: !6)
|
||||
!6 = !{!7, !7}
|
||||
|
|
|
|||
|
|
@ -72,10 +72,9 @@
|
|||
!llvm.module.flags = !{!15, !16, !17}
|
||||
!llvm.ident = !{!18}
|
||||
|
||||
!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (ssh://gerritmirror.rnd.ki.sw.ericsson.se:29418/flextools/llvm-project.git f76e863b549ddccd5e917e2f3ff50646915654d2)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
|
||||
!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 10.0.0 (ssh://gerritmirror.rnd.ki.sw.ericsson.se:29418/flextools/llvm-project.git f76e863b549ddccd5e917e2f3ff50646915654d2)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
|
||||
!1 = !DIFile(filename: "orrxrs.c", directory: "/repo/edasten/llvm-project/llvm")
|
||||
!2 = !{}
|
||||
!3 = !{!4, !8, !12}
|
||||
!4 = !DISubprogram(name: "call_int", scope: !1, file: !1, line: 1, type: !5, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
|
||||
!5 = !DISubroutineType(types: !6)
|
||||
!6 = !{null, !7}
|
||||
|
|
@ -159,7 +158,7 @@ body: |
|
|||
...
|
||||
|
||||
# CHECK: DW_TAG_GNU_call_site
|
||||
# CHECK-NEXT: DW_AT_abstract_origin (0x0000002a "call_int")
|
||||
# CHECK-NEXT: DW_AT_abstract_origin ({{.*}} "call_int")
|
||||
#
|
||||
# CHECK: DW_TAG_GNU_call_site_parameter
|
||||
# CHECK-NEXT: DW_AT_location (DW_OP_reg0 W0)
|
||||
|
|
@ -205,7 +204,7 @@ body: |
|
|||
...
|
||||
|
||||
# CHECK: DW_TAG_GNU_call_site
|
||||
# CHECK-NEXT: DW_AT_abstract_origin (0x0000003e "call_long")
|
||||
# CHECK-NEXT: DW_AT_abstract_origin ({{.*}} "call_long")
|
||||
#
|
||||
# CHECK: DW_TAG_GNU_call_site_parameter
|
||||
# CHECK-NEXT: DW_AT_location (DW_OP_reg0 W0)
|
||||
|
|
@ -265,7 +264,7 @@ body: |
|
|||
...
|
||||
|
||||
# CHECK: DW_TAG_GNU_call_site
|
||||
# CHECK-NEXT: DW_AT_abstract_origin (0x00000052 "call_int_int")
|
||||
# CHECK-NEXT: DW_AT_abstract_origin ({{.*}} "call_int_int")
|
||||
#
|
||||
# CHECK: DW_TAG_GNU_call_site_parameter
|
||||
# CHECK-NEXT: DW_AT_location (DW_OP_reg0 W0)
|
||||
|
|
|
|||
|
|
@ -1,12 +1,12 @@
|
|||
# RUN: llc -start-after=livedebugvalues -mtriple=x86_64-apple-darwin -o - %s -filetype=obj \
|
||||
# RUN: -emit-call-site-info | llvm-dwarfdump - | FileCheck %s -implicit-check-not=call_site_parameter
|
||||
|
||||
# CHECK-LABEL: DW_TAG_subprogram
|
||||
# CHECK: DW_AT_name ("f")
|
||||
# CHECK-LABEL: DW_TAG_subprogram
|
||||
# CHECK: DW_TAG_subprogram
|
||||
# CHECK: DW_AT_name ("g")
|
||||
# CHECK: DW_TAG_formal_parameter
|
||||
# CHECK-NEXT: DW_AT_location (DW_OP_reg17 XMM0)
|
||||
# CHECK: DW_TAG_subprogram
|
||||
# CHECK: DW_AT_name ("f")
|
||||
|
||||
# struct S {
|
||||
# float w;
|
||||
|
|
@ -29,9 +29,8 @@
|
|||
!7 = !{i32 2, !"Debug Info Version", i32 3}
|
||||
!8 = !{i32 1, !"wchar_size", i32 4}
|
||||
!9 = !{i32 7, !"PIC Level", i32 2}
|
||||
!10 = distinct !DICompileUnit(language: DW_LANG_ObjC, file: !15, producer: "", isOptimized: true, runtimeVersion: 2, emissionKind: FullDebug, enums: !12, retainedTypes: !13, nameTableKind: None, sysroot: "/")
|
||||
!10 = distinct !DICompileUnit(language: DW_LANG_ObjC, file: !15, producer: "", isOptimized: true, runtimeVersion: 2, emissionKind: FullDebug, enums: !12, nameTableKind: None, sysroot: "/")
|
||||
!12 = !{}
|
||||
!13 = !{!14}
|
||||
!14 = !DISubprogram(name: "f", scope: !15, file: !15, line: 4, type: !16, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !12)
|
||||
!15 = !DIFile(filename: "test.m", directory: "/")
|
||||
!16 = !DISubroutineType(types: !17)
|
||||
|
|
|
|||
|
|
@ -39,17 +39,11 @@
|
|||
# CHECK-GNU-NEXT: DW_AT_location (DW_OP_reg8 R8)
|
||||
# CHECK-GNU-NEXT: DW_AT_GNU_call_site_value (DW_OP_breg14 R14+3)
|
||||
|
||||
# CHECK-DWARF5: [[getValue_SP:.*]]: DW_TAG_subprogram
|
||||
# CHECK-DWARF5-NEXT: DW_AT_name ("getVal")
|
||||
|
||||
# CHECK-DWARF5: [[foo_SP:.*]]: DW_TAG_subprogram
|
||||
# CHECK-DWARF5-NEXT: DW_AT_name ("foo")
|
||||
|
||||
# CHECK-DWARF5: DW_TAG_call_site
|
||||
# CHECK-DWARF5: DW_AT_call_origin ([[getValue_SP]])
|
||||
# CHECK-DWARF5: DW_AT_call_origin ([[getValue_SP:.*]])
|
||||
#
|
||||
# CHECK-DWARF5: DW_TAG_call_site
|
||||
# CHECK-DWARF5: DW_AT_call_origin ([[foo_SP]])
|
||||
# CHECK-DWARF5: DW_AT_call_origin ([[foo_SP:.*]])
|
||||
# CHECK-DWARF5: DW_AT_call_return_pc {{.*}}
|
||||
# CHECK-DWARF5-EMPTY:
|
||||
# CHECK-DWARF5: DW_TAG_call_site_parameter
|
||||
|
|
@ -71,6 +65,12 @@
|
|||
# CHECK-DWARF5-NEXT: DW_AT_location (DW_OP_reg8 R8)
|
||||
# CHECK-DWARF5-NEXT: DW_AT_call_value (DW_OP_breg14 R14+3)
|
||||
|
||||
# CHECK-DWARF5: [[getValue_SP]]: DW_TAG_subprogram
|
||||
# CHECK-DWARF5-NEXT: DW_AT_name ("getVal")
|
||||
|
||||
# CHECK-DWARF5: [[foo_SP]]: DW_TAG_subprogram
|
||||
# CHECK-DWARF5-NEXT: DW_AT_name ("foo")
|
||||
|
||||
--- |
|
||||
; ModuleID = 'test.c'
|
||||
source_filename = "test.c"
|
||||
|
|
@ -105,10 +105,9 @@
|
|||
!llvm.module.flags = !{!6, !7, !8}
|
||||
!llvm.ident = !{!9}
|
||||
|
||||
!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 9.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, nameTableKind: None)
|
||||
!0 = distinct !DICompileUnit(language: DW_LANG_C99, file: !1, producer: "clang version 9.0.0", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, nameTableKind: None)
|
||||
!1 = !DIFile(filename: "test.c", directory: "/dir")
|
||||
!2 = !{}
|
||||
!3 = !{!4, !5}
|
||||
!4 = !DISubprogram(name: "getVal", scope: !1, file: !1, line: 2, spFlags: DISPFlagOptimized, retainedNodes: !2)
|
||||
!5 = !DISubprogram(name: "foo", scope: !1, file: !1, line: 1, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
|
||||
!6 = !{i32 2, !"Dwarf Version", i32 4}
|
||||
|
|
|
|||
|
|
@ -13,7 +13,7 @@
|
|||
; often - add another IR file with a different DW_OP_convert that's otherwise
|
||||
; identical and demonstrate that they have different DWO IDs.
|
||||
|
||||
; SPLIT: 0x00000000: Compile Unit: {{.*}} DWO_id = 0x693879c39196a3ff
|
||||
; SPLIT: 0x00000000: Compile Unit: {{.*}} DWO_id = 0xecf2563326b0bdd3
|
||||
|
||||
; Regression testing a fairly quirky bug where instead of hashing (see above),
|
||||
; extra bytes would be emitted into the output assembly in no
|
||||
|
|
@ -51,10 +51,9 @@ attributes #2 = { nounwind readnone speculatable willreturn }
|
|||
!llvm.module.flags = !{!7, !8, !9}
|
||||
!llvm.ident = !{!10}
|
||||
|
||||
!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 11.0.0 (git@github.com:llvm/llvm-project.git edc3f4f02e54c2ae1067f60f6a0ed6caf5b92ef6)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, retainedTypes: !3, splitDebugInlining: false, nameTableKind: None)
|
||||
!0 = distinct !DICompileUnit(language: DW_LANG_C_plus_plus_14, file: !1, producer: "clang version 11.0.0 (git@github.com:llvm/llvm-project.git edc3f4f02e54c2ae1067f60f6a0ed6caf5b92ef6)", isOptimized: true, runtimeVersion: 0, emissionKind: FullDebug, enums: !2, splitDebugInlining: false, nameTableKind: None)
|
||||
!1 = !DIFile(filename: "loc.cpp", directory: "/usr/local/google/home/blaikie/dev/scratch")
|
||||
!2 = !{}
|
||||
!3 = !{!4}
|
||||
!4 = !DISubprogram(name: "f1", linkageName: "_Z2f1v", scope: !1, file: !1, line: 1, type: !5, flags: DIFlagPrototyped, spFlags: DISPFlagOptimized, retainedNodes: !2)
|
||||
!5 = !DISubroutineType(types: !6)
|
||||
!6 = !{null}
|
||||
|
|
|
|||
Loading…
Reference in New Issue