Skip to content
This repository was archived by the owner on Feb 5, 2019. It is now read-only.

Commit 3ec14da

Browse files
authored
Merge pull request #58 from tromey/rust-main-subprogram
Add support for DW_AT_main_subprogram
2 parents f76056b + 2967489 commit 3ec14da

File tree

4 files changed

+40
-0
lines changed

4 files changed

+40
-0
lines changed

include/llvm/IR/DebugInfoFlags.def

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,5 +38,6 @@ HANDLE_DI_FLAG((2 << 16), MultipleInheritance)
3838
HANDLE_DI_FLAG((3 << 16), VirtualInheritance)
3939
HANDLE_DI_FLAG((1 << 18), IntroducedVirtual)
4040
HANDLE_DI_FLAG((1 << 19), BitField)
41+
HANDLE_DI_FLAG((1 << 21), MainSubprogram)
4142

4243
#undef HANDLE_DI_FLAG

include/llvm/IR/DebugInfoMetadata.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1402,6 +1402,7 @@ class DISubprogram : public DILocalScope {
14021402
}
14031403
bool isExplicit() const { return getFlags() & FlagExplicit; }
14041404
bool isPrototyped() const { return getFlags() & FlagPrototyped; }
1405+
bool isMainSubprogram() const { return getFlags() & FlagMainSubprogram; }
14051406

14061407
/// \brief Check if this is reference-qualified.
14071408
///

lib/CodeGen/AsmPrinter/DwarfUnit.cpp

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1260,6 +1260,9 @@ void DwarfUnit::applySubprogramAttributes(const DISubprogram *SP, DIE &SPDie,
12601260

12611261
if (SP->isExplicit())
12621262
addFlag(SPDie, dwarf::DW_AT_explicit);
1263+
1264+
if (SP->isMainSubprogram())
1265+
addFlag(SPDie, dwarf::DW_AT_main_subprogram);
12631266
}
12641267

12651268
void DwarfUnit::constructSubrangeDIE(DIE &Buffer, const DISubrange *SR,
Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
; REQUIRES: object-emission
2+
3+
; RUN: %llc_dwarf -O0 -filetype=obj < %s > %t
4+
; RUN: llvm-dwarfdump -debug-dump=info %t | FileCheck %s
5+
6+
; Make sure we're emitting DW_AT_main_subprogram.
7+
; CHECK: DW_TAG_subprogram
8+
; CHECK-NOT: {{DW_TAG|NULL}}
9+
; CHECK: DW_AT_name {{.*}} "main"
10+
; CHECK-NOT: {{DW_TAG|NULL}}
11+
; CHECK: DW_AT_main_subprogram [DW_FORM_flag_present] (true)
12+
13+
define i32 @main() #0 !dbg !4 {
14+
entry:
15+
%retval = alloca i32, align 4
16+
store i32 0, i32* %retval
17+
ret i32 0, !dbg !10
18+
}
19+
20+
attributes #0 = { nounwind uwtable "less-precise-fpmad"="false" "no-frame-pointer-elim"="true" "no-frame-pointer-elim-non-leaf" "no-infs-fp-math"="false" "no-nans-fp-math"="false" "unsafe-fp-math"="false" "use-soft-float"="false" }
21+
22+
!llvm.dbg.cu = !{!0}
23+
!llvm.module.flags = !{!9, !11}
24+
25+
!0 = distinct !DICompileUnit(language: DW_LANG_C99, producer: "clang version 3.4 (trunk 185475)", isOptimized: false, emissionKind: FullDebug, file: !1, enums: !2, retainedTypes: !2, globals: !2, imports: !2)
26+
!1 = !DIFile(filename: "CodeGen/dwarf-version.c", directory: "test")
27+
!2 = !{}
28+
!4 = distinct !DISubprogram(name: "main", line: 6, isLocal: false, isDefinition: true, virtualIndex: 6, flags: DIFlagPrototyped | DIFlagMainSubprogram, isOptimized: false, unit: !0, scopeLine: 6, file: !1, scope: !5, type: !6, variables: !2)
29+
!5 = !DIFile(filename: "CodeGen/dwarf-version.c", directory: "test")
30+
!6 = !DISubroutineType(types: !7)
31+
!7 = !{!8}
32+
!8 = !DIBasicType(tag: DW_TAG_base_type, name: "int", size: 32, align: 32, encoding: DW_ATE_signed)
33+
!9 = !{i32 2, !"Dwarf Version", i32 4}
34+
!10 = !DILocation(line: 7, scope: !4)
35+
!11 = !{i32 1, !"Debug Info Version", i32 3}

0 commit comments

Comments
 (0)