squiid/llvm
1
0
Fork 0
Code Issues Pull requests Activity

DebugInfo: Fix a few bot failures for type dumping fixes

Browse source
This commit is contained in:
David Blaikie 2021-09-03 14:08:30 -07:00
parent 84e1258feb
commit bc066e26c9
3 changed files with 5 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
lld/test/wasm/debuginfo.test
View file

@ -46,7 +46,7 @@ CHECK-NEXT: DW_AT_name ("hi_foo.c")
CHECK: DW_TAG_variable
CHECK-NEXT: DW_AT_name ("y")
CHECK-NEXT: DW_AT_type (0x000000ac "int[2]")
CHECK-NEXT: DW_AT_type (0x000000ac "int [2]")
CHECK-NEXT: DW_AT_external (true)
CHECK-NEXT: DW_AT_decl_file ("{{.*}}hi_foo.c")
CHECK-NEXT: DW_AT_decl_line (1)
@ -68,7 +68,7 @@ CHECK-NEXT: DW_AT_encoding (DW_ATE_unsigned)
CHECK: DW_TAG_variable
CHECK-NEXT: DW_AT_name ("z")
CHECK-NEXT: DW_AT_type (0x000000ac "int[2]")
CHECK-NEXT: DW_AT_type (0x000000ac "int [2]")
CHECK-NEXT: DW_AT_external (true)
CHECK-NEXT: DW_AT_decl_file ("{{.*}}hi_foo.c")
CHECK-NEXT: DW_AT_decl_line (8)

6
llvm/lib/DebugInfo/DWARF/DWARFDie.cpp
View file

@ -180,16 +180,14 @@ static void dumpPointerLikeTypeBefore(raw_ostream &OS, DWARFDie D, DWARFDie Inne
}
static DWARFDie dumpTypeNameBefore(raw_ostream &OS, DWARFDie D, bool *Word) {
if (Word)
*Word = true;
if (!D) {
OS << "void";
if (Word)
*Word = true;
return DWARFDie();
}
if (const char *Name = D.getName(DINameKind::LinkageName)) {
OS << Name;
if (Word)
*Word = true;
return DWARFDie();
}

2
llvm/test/tools/llvm-dwarfdump/XCOFF/basic.test
View file

@ -95,7 +95,7 @@
# DWARF32-NEXT: DW_AT_name ("__func__")
# DWARF32-NEXT: DW_AT_decl_file ("/basic.c")
# DWARF32-NEXT: DW_AT_decl_line (0)
# DWARF32-NEXT: DW_AT_type (0x0000005a "const char[5]")
# DWARF32-NEXT: DW_AT_type (0x0000005a "const char [5]")
# DWARF32: 0x00000096: NULL
# DWARF32: 0x00000097: NULL
# DWARF32: .debug_line contents: