Skip to content

Commit 00ece1b

Browse files
committed
Emit DW_TAG_formal_parameter for unnamed parameters.
This change essentially reverts r87069 which came without a test case. It causes no regressions in the GDB 7.5 test suite & fixes 25 xfails (commit to the test suite to follow). If anyone can present a test case that demonstrates why this check is necessary I'd be happy to account for it in one way or another. git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@171609 91177308-0d34-0410-b5e6-96231b3b80d8
1 parent 835e7bc commit 00ece1b

File tree

2 files changed

+14
-9
lines changed

2 files changed

+14
-9
lines changed

lib/CodeGen/AsmPrinter/DwarfCompileUnit.cpp

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1378,8 +1378,6 @@ void CompileUnit::constructContainingTypeDIEs() {
13781378
/// constructVariableDIE - Construct a DIE for the given DbgVariable.
13791379
DIE *CompileUnit::constructVariableDIE(DbgVariable *DV, bool isScopeAbstract) {
13801380
StringRef Name = DV->getName();
1381-
if (Name.empty())
1382-
return NULL;
13831381

13841382
// Translate tag to proper Dwarf tag.
13851383
unsigned Tag = DV->getTag();

test/DebugInfo/X86/DW_AT_object_pointer.ll

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,25 @@
11
; RUN: llc -mtriple=x86_64-apple-darwin %s -o %t -filetype=obj
22
; RUN: llvm-dwarfdump %t | FileCheck %s
33

4-
; CHECK: DW_AT_object_pointer [DW_FORM_ref4] (cu + 0x00bf => {0x000000bf})
5-
; CHECK: 0x000000bf: DW_TAG_formal_parameter [12]
6-
; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000085] = "this")
4+
; CHECK: DW_TAG_formal_parameter [
5+
; CHECK: DW_TAG_class_type
6+
; CHECK: DW_AT_object_pointer [DW_FORM_ref4] (cu + 0x00fd => {0x000000fd})
7+
; CHECK: 0x000000fd: DW_TAG_formal_parameter [13]
8+
; CHECK-NEXT: DW_AT_name [DW_FORM_strp] ( .debug_str[0x00000086] = "this")
79

810
%class.A = type { i32 }
911

10-
define i32 @_Z3foov() nounwind uwtable ssp {
12+
define i32 @_Z3fooi(i32) nounwind uwtable ssp {
1113
entry:
14+
%.addr = alloca i32, align 4
1215
%a = alloca %class.A, align 4
16+
store i32 %0, i32* %.addr, align 4
17+
call void @llvm.dbg.declare(metadata !{i32* %.addr}, metadata !36), !dbg !35
1318
call void @llvm.dbg.declare(metadata !{%class.A* %a}, metadata !21), !dbg !23
1419
call void @_ZN1AC1Ev(%class.A* %a), !dbg !24
1520
%m_a = getelementptr inbounds %class.A* %a, i32 0, i32 0, !dbg !25
16-
%0 = load i32* %m_a, align 4, !dbg !25
17-
ret i32 %0, !dbg !25
21+
%1 = load i32* %m_a, align 4, !dbg !25
22+
ret i32 %1, !dbg !25
1823
}
1924

2025
declare void @llvm.dbg.declare(metadata, metadata) nounwind readnone
@@ -47,7 +52,7 @@ entry:
4752
!2 = metadata !{i32 0}
4853
!3 = metadata !{metadata !4}
4954
!4 = metadata !{metadata !5, metadata !10, metadata !20}
50-
!5 = metadata !{i32 786478, i32 0, metadata !6, metadata !"foo", metadata !"foo", metadata !"_Z3foov", metadata !6, i32 7, metadata !7, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, i32 ()* @_Z3foov, null, null, metadata !1, i32 7} ; [ DW_TAG_subprogram ] [line 7] [def] [foo]
55+
!5 = metadata !{i32 786478, i32 0, metadata !6, metadata !"foo", metadata !"foo", metadata !"_Z3fooi", metadata !6, i32 7, metadata !7, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, i32 (i32)* @_Z3fooi, null, null, metadata !1, i32 7} ; [ DW_TAG_subprogram ] [line 7] [def] [foo]
5156
!6 = metadata !{i32 786473, metadata !"bar.cpp", metadata !"/Users/echristo/debug-tests", null} ; [ DW_TAG_file_type ]
5257
!7 = metadata !{i32 786453, i32 0, metadata !"", i32 0, i32 0, i64 0, i64 0, i64 0, i32 0, null, metadata !8, i32 0, i32 0} ; [ DW_TAG_subroutine_type ] [line 0, size 0, align 0, offset 0] [from ]
5358
!8 = metadata !{metadata !9}
@@ -63,6 +68,8 @@ entry:
6368
!18 = metadata !{metadata !19}
6469
!19 = metadata !{i32 786468} ; [ DW_TAG_base_type ] [line 0, size 0, align 0, offset 0]
6570
!20 = metadata !{i32 786478, i32 0, null, metadata !"A", metadata !"A", metadata !"_ZN1AC2Ev", metadata !6, i32 3, metadata !11, i1 false, i1 true, i32 0, i32 0, null, i32 256, i1 false, void (%class.A*)* @_ZN1AC2Ev, null, metadata !17, metadata !1, i32 3} ; [ DW_TAG_subprogram ] [line 3] [def] [A]
71+
!36 = metadata !{i32 786689, metadata !5, metadata !"", metadata !6, i32 16777223, metadata !9, i32 0, i32 0} ; [ DW_TAG_arg_variable ] [line 7]
72+
!35 = metadata !{i32 7, i32 0, metadata !5, null}
6673
!21 = metadata !{i32 786688, metadata !22, metadata !"a", metadata !6, i32 8, metadata !14, i32 0, i32 0} ; [ DW_TAG_auto_variable ] [a] [line 8]
6774
!22 = metadata !{i32 786443, metadata !5, i32 7, i32 11, metadata !6, i32 0} ; [ DW_TAG_lexical_block ] [/Users/echristo/debug-tests/bar.cpp]
6875
!23 = metadata !{i32 8, i32 5, metadata !22, null}

0 commit comments

Comments
 (0)