diff options
| -rw-r--r-- | lib/DebugInfo/DWARFContext.cpp | 8 | ||||
| -rw-r--r-- | test/DebugInfo/X86/gnu-public-names.ll | 11 | ||||
| -rw-r--r-- | test/DebugInfo/dwarf-public-names.ll | 2 | ||||
| -rw-r--r-- | test/DebugInfo/dwarfdump-pubnames.test | 5 |
4 files changed, 8 insertions, 18 deletions
diff --git a/lib/DebugInfo/DWARFContext.cpp b/lib/DebugInfo/DWARFContext.cpp index 6056de7a35..e47719025c 100644 --- a/lib/DebugInfo/DWARFContext.cpp +++ b/lib/DebugInfo/DWARFContext.cpp @@ -34,10 +34,10 @@ static void dumpPubSection(raw_ostream &OS, StringRef Name, StringRef Data, OS << "\n." << Name << " contents:\n"; DataExtractor pubNames(Data, LittleEndian, 0); uint32_t offset = 0; - OS << "Length: " << pubNames.getU32(&offset) << "\n"; - OS << "Version: " << pubNames.getU16(&offset) << "\n"; - OS << "Offset in .debug_info: " << pubNames.getU32(&offset) << "\n"; - OS << "Size: " << pubNames.getU32(&offset) << "\n"; + OS << "length = " << format("0x%08x", pubNames.getU32(&offset)); + OS << " version = " << format("0x%04x", pubNames.getU16(&offset)); + OS << " unit_offset = " << format("0x%08x", pubNames.getU32(&offset)); + OS << " unit_size = " << format("0x%08x", pubNames.getU32(&offset)) << '\n'; if (GnuStyle) OS << "Offset Linkage Kind Name\n"; else diff --git a/test/DebugInfo/X86/gnu-public-names.ll b/test/DebugInfo/X86/gnu-public-names.ll index 2a6d997805..a9fc0ed48b 100644 --- a/test/DebugInfo/X86/gnu-public-names.ll +++ b/test/DebugInfo/X86/gnu-public-names.ll @@ -104,10 +104,7 @@ ; CHECK-NEXT: DW_AT_name {{.*}} "global_function" ; CHECK-LABEL: .debug_gnu_pubnames contents: -; CHECK-NEXT: Length: 231 -; CHECK-NEXT: Version: 2 -; CHECK-NEXT: Offset in .debug_info: 0 -; CHECK-NEXT: Size: 379 +; CHECK-NEXT: length = 0x000000e7 version = 0x0002 unit_offset = 0x00000000 unit_size = 0x0000017b ; CHECK-NEXT: Offset Linkage Kind Name ; CHECK-DAG: [[GLOBAL_FUNC]] EXTERNAL FUNCTION "global_function" ; CHECK-DAG: [[NS]] EXTERNAL TYPE "ns" @@ -121,11 +118,7 @@ ; CHECK-LABEL: debug_gnu_pubtypes contents: -; CHECK-NEXT: Length: -; CHECK-NEXT: Version: -; CHECK-NEXT: Offset in .debug_info: -; CHECK-NEXT: Size: -; CHECK-NEXT: Offset Linkage Kind Name +; CHECK: Offset Linkage Kind Name ; CHECK-DAG: [[C]] EXTERNAL TYPE "C" ; CHECK-DAG: [[D]] EXTERNAL TYPE "ns::D" ; CHECK-DAG: [[INT]] STATIC TYPE "int" diff --git a/test/DebugInfo/dwarf-public-names.ll b/test/DebugInfo/dwarf-public-names.ll index ee9cbd5d8d..b5609eaf75 100644 --- a/test/DebugInfo/dwarf-public-names.ll +++ b/test/DebugInfo/dwarf-public-names.ll @@ -37,7 +37,7 @@ ; Skip the output to the header of the pubnames section. ; CHECK: debug_pubnames -; CHECK: Version: 2 +; CHECK: version = 0x0002 ; Check for each name in the output. ; CHECK: global_namespace_variable diff --git a/test/DebugInfo/dwarfdump-pubnames.test b/test/DebugInfo/dwarfdump-pubnames.test index 1520036660..215953abe7 100644 --- a/test/DebugInfo/dwarfdump-pubnames.test +++ b/test/DebugInfo/dwarfdump-pubnames.test @@ -2,10 +2,7 @@ RUN: llvm-dwarfdump %p/Inputs/dwarfdump-pubnames.elf-x86-64 \ RUN: -debug-dump=pubnames | FileCheck %s CHECK: .debug_pubnames contents: -CHECK: Length: 161 -CHECK: Version: 2 -CHECK: Offset in .debug_info: 0 -CHECK: Size: 321 +CHECK: length = 0x000000a1 version = 0x0002 unit_offset = 0x00000000 unit_size = 0x00000141 CHECK: Offset Name CHECK: 0x00000098 "global_namespace_variable" |