[llvm] r254833 - [llvm-dwp] Add coverage for both the presence and absence of type units, and fix/remove the emission of a broken tu_index when no type units are present
David Blaikie via llvm-commits
llvm-commits at lists.llvm.org
Fri Dec 4 19:41:54 PST 2015
Author: dblaikie
Date: Fri Dec 4 21:41:53 2015
New Revision: 254833
URL: http://llvm.org/viewvc/llvm-project?rev=254833&view=rev
Log:
[llvm-dwp] Add coverage for both the presence and absence of type units, and fix/remove the emission of a broken tu_index when no type units are present
Added:
llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo
llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo
llvm/trunk/test/tools/llvm-dwp/X86/simple.test
- copied, changed from r254830, llvm/trunk/test/tools/llvm-dwp/X86/type_units.test
Removed:
llvm/trunk/test/tools/llvm-dwp/X86/type_units.test
Modified:
llvm/trunk/tools/llvm-dwp/llvm-dwp.cpp
Added: llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo?rev=254833&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo (added) and llvm/trunk/test/tools/llvm-dwp/Inputs/simple/a.dwo Fri Dec 4 21:41:53 2015 differ
Added: llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo?rev=254833&view=auto
==============================================================================
Binary files llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo (added) and llvm/trunk/test/tools/llvm-dwp/Inputs/simple/b.dwo Fri Dec 4 21:41:53 2015 differ
Copied: llvm/trunk/test/tools/llvm-dwp/X86/simple.test (from r254830, llvm/trunk/test/tools/llvm-dwp/X86/type_units.test)
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/X86/simple.test?p2=llvm/trunk/test/tools/llvm-dwp/X86/simple.test&p1=llvm/trunk/test/tools/llvm-dwp/X86/type_units.test&r1=254830&r2=254833&rev=254833&view=diff
==============================================================================
--- llvm/trunk/test/tools/llvm-dwp/X86/type_units.test (original)
+++ llvm/trunk/test/tools/llvm-dwp/X86/simple.test Fri Dec 4 21:41:53 2015
@@ -1,5 +1,8 @@
+RUN: llvm-dwp %p/../Inputs/simple/a.dwo %p/../Inputs/simple/b.dwo -o %t
+RUN: llvm-dwarfdump %t | FileCheck --check-prefix=CHECK --check-prefix=NOTYP %s
+RUN: llvm-objdump -h %t | FileCheck --check-prefix=NOTYPOBJ %s
RUN: llvm-dwp %p/../Inputs/type_units/a.dwo %p/../Inputs/type_units/b.dwo -o %t
-RUN: llvm-dwarfdump %t | FileCheck %s
+RUN: llvm-dwarfdump %t | FileCheck --check-prefix=CHECK --check-prefix=TYPES %s
FIXME: For some reason, piping straight from llvm-dwp to llvm-dwarfdump doesn't behave well - looks like dwarfdump is reading/closes before dwp has finished.
@@ -28,7 +31,7 @@ CHECK: DW_TAG_formal_parameter
CHECK: .debug_info.dwo contents:
CHECK: [[AOFF:0x[0-9a-f]*]]:
-CHECK-LABEL: Compile Unit: length = 0x00000029 version = 0x0004 abbr_offset =
+CHECK-LABEL: Compile Unit: length = {{.*}} version = 0x0004 abbr_offset =
CHECK: 0x[[AAOFF]] addr_size = 0x08 (next unit at [[BOFF:.*]])
CHECK: DW_TAG_compile_unit
CHECK: DW_AT_name {{.*}} "a.cpp"
@@ -36,42 +39,51 @@ CHECK: DW_AT_GNU_dwo_id {{.*}} ([[DWOA
CHECK: DW_TAG_variable
CHECK: DW_AT_name {{.*}} "a"
CHECK: DW_TAG_structure_type
-CHECK: DW_AT_signature {{.*}} ([[FOOSIG:.*]])
+NOTYP: DW_AT_name {{.*}} "foo"
+TYPES: DW_AT_signature {{.*}} ([[FOOSIG:.*]])
CHECK: [[BOFF]]:
-CHECK-LABEL: Compile Unit: length = 0x00000035 version = 0x0004 abbr_offset =
+CHECK-LABEL: Compile Unit: length = {{.*}} version = 0x0004 abbr_offset =
CHECK: 0x[[BAOFF]] addr_size = 0x08 (next unit at [[XOFF:.*]])
CHECK: DW_AT_name {{.*}} "b.cpp"
CHECK: DW_AT_GNU_dwo_id {{.*}} ([[DWOB:.*]])
CHECK: DW_TAG_structure_type
-CHECK: DW_AT_signature {{.*}} ([[BARSIG:.*]])
+NOTYP: DW_AT_name {{.*}} "bar"
+TYPES: DW_AT_signature {{.*}} ([[BARSIG:.*]])
CHECK: DW_TAG_subprogram
CHECK: DW_AT_name {{.*}} "b"
CHECK: DW_TAG_formal_parameter
-CHECK-LABEL: .debug_types.dwo contents:
-CHECK: [[FOOUOFF:0x[0-9a-f]*]]:
-CHECK-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset =
-CHECK: 0x[[AAOFF]] addr_size = 0x08 type_signature = [[FOOSIG]] type_offset = 0x[[FOOOFF:.*]] (next unit at [[BARUOFF:.*]])
-CHECK: DW_TAG_type_unit
-CHECK: [[FOOOFF]]: DW_TAG_structure_type
-CHECK: DW_AT_name {{.*}} "foo"
-CHECK: [[BARUOFF]]:
-CHECK-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset =
-CHECK: 0x[[BAOFF]] addr_size = 0x08 type_signature = [[BARSIG]] type_offset = 0x001e (next unit at [[XUOFF:.*]])
-CHECK: DW_TAG_type_unit
-CHECK: 0x00000042: DW_TAG_structure_type
-CHECK: DW_AT_name {{.*}} "bar"
+NOTYP-NOT: .debug_types.dwo contents:
+TYPES-LABEL: .debug_types.dwo contents:
+TYPES: [[FOOUOFF:0x[0-9a-f]*]]:
+TYPES-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset =
+TYPES: 0x[[AAOFF]] addr_size = 0x08 type_signature = [[FOOSIG]] type_offset = 0x[[FOOOFF:.*]] (next unit at [[BARUOFF:.*]])
+TYPES: DW_TAG_type_unit
+TYPES: [[FOOOFF]]: DW_TAG_structure_type
+TYPES: DW_AT_name {{.*}} "foo"
+TYPES: [[BARUOFF]]:
+TYPES-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset =
+TYPES: 0x[[BAOFF]] addr_size = 0x08 type_signature = [[BARSIG]] type_offset = 0x001e (next unit at [[XUOFF:.*]])
+TYPES: DW_TAG_type_unit
+TYPES: 0x00000042: DW_TAG_structure_type
+TYPES: DW_AT_name {{.*}} "bar"
CHECK-LABEL: .debug_cu_index contents:
CHECK: Index Signature INFO ABBREV LINE STR_OFFSETS
-CHECK: 1 [[DWOA]] {{\[}}[[AOFF]], [[BOFF]]) [0x0000[[AAOFF]], 0x0000[[BAOFF]]) [0x00000000, 0x0000001a) [0x00000000, 0x00000010)
-CHECK: 3 [[DWOB]] {{\[}}[[BOFF]], [[XOFF]]) [0x0000[[BAOFF]], 0x00000099) [0x0000001a, 0x00000034) [0x00000010, 0x00000024)
+TYPES: 1 [[DWOA]] {{\[}}[[AOFF]], [[BOFF]]) [0x0000[[AAOFF]], 0x0000[[BAOFF]]) [0x00000000, 0x0000001a) [0x00000000, 0x00000010)
+TYPES: 3 [[DWOB]] {{\[}}[[BOFF]], [[XOFF]]) [0x0000[[BAOFF]], 0x00000099) [0x0000001a, 0x00000034) [0x00000010, 0x00000024)
+NOTYP: 3 [[DWOA]] {{\[}}[[AOFF]], [[BOFF]]) [0x0000[[AAOFF]], 0x0000[[BAOFF]]) [0x00000000, 0x00000011) [0x00000000, 0x00000010)
+NOTYP: 4 [[DWOB]] {{\[}}[[BOFF]], [[XOFF]]) [0x0000[[BAOFF]], 0x00000075) [0x00000011, 0x00000022) [0x00000010, 0x00000024)
CHECK-LABEL: .debug_tu_index contents:
-CHECK: Index Signature TYPES ABBREV LINE STR_OFFSETS
-CHECK: 1 [[FOOSIG]] {{\[}}[[FOOUOFF]], [[BARUOFF]]) [0x0000[[AAOFF]], 0x0000[[BAOFF]]) [0x00000000, 0x0000001a) [0x00000000, 0x00000010)
-CHECK: 4 [[BARSIG]] {{\[}}[[BARUOFF]], [[XUOFF]]) [0x0000[[BAOFF]], 0x00000099) [0x0000001a, 0x00000034) [0x00000010, 0x00000024)
+NOTYP-NOT: Index
+TYPES: Index Signature TYPES ABBREV LINE STR_OFFSETS
+TYPES: 1 [[FOOSIG]] {{\[}}[[FOOUOFF]], [[BARUOFF]]) [0x0000[[AAOFF]], 0x0000[[BAOFF]]) [0x00000000, 0x0000001a) [0x00000000, 0x00000010)
+TYPES: 4 [[BARSIG]] {{\[}}[[BARUOFF]], [[XUOFF]]) [0x0000[[BAOFF]], 0x00000099) [0x0000001a, 0x00000034) [0x00000010, 0x00000024)
+
+Ensure we do not create a debug_tu_index, even an empty or malformed one.
+NOTYPOBJ-NOT: .debug_tu_index
CHECK-LABEL: .debug_str.dwo contents:
CHECK: "clang version
Removed: llvm/trunk/test/tools/llvm-dwp/X86/type_units.test
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/test/tools/llvm-dwp/X86/type_units.test?rev=254832&view=auto
==============================================================================
--- llvm/trunk/test/tools/llvm-dwp/X86/type_units.test (original)
+++ llvm/trunk/test/tools/llvm-dwp/X86/type_units.test (removed)
@@ -1,86 +0,0 @@
-RUN: llvm-dwp %p/../Inputs/type_units/a.dwo %p/../Inputs/type_units/b.dwo -o %t
-RUN: llvm-dwarfdump %t | FileCheck %s
-
-FIXME: For some reason, piping straight from llvm-dwp to llvm-dwarfdump doesn't behave well - looks like dwarfdump is reading/closes before dwp has finished.
-
-DWP from non-type-unit debug info for these two translation units:
-a.cpp:
- struct foo { };
- foo a;
-
-b.cpp:
- struct bar { };
- void b(bar) {
- }
-
-CHECK-LABEL: .debug_abbrev.dwo contents:
-CHECK-LABEL: Abbrev table for offset:
-CHECK: 0x0000[[AAOFF:.*]]
-CHECK: DW_TAG_compile_unit
-CHECK: DW_TAG_variable
-CHECK: DW_TAG_structure_type
-CHECK-LABEL: Abbrev table for offset:
-CHECK: 0x0000[[BAOFF:.*]]
-CHECK: DW_TAG_compile_unit
-CHECK: DW_TAG_structure_type
-CHECK: DW_TAG_subprogram
-CHECK: DW_TAG_formal_parameter
-
-CHECK: .debug_info.dwo contents:
-CHECK: [[AOFF:0x[0-9a-f]*]]:
-CHECK-LABEL: Compile Unit: length = 0x00000029 version = 0x0004 abbr_offset =
-CHECK: 0x[[AAOFF]] addr_size = 0x08 (next unit at [[BOFF:.*]])
-CHECK: DW_TAG_compile_unit
-CHECK: DW_AT_name {{.*}} "a.cpp"
-CHECK: DW_AT_GNU_dwo_id {{.*}} ([[DWOA:.*]])
-CHECK: DW_TAG_variable
-CHECK: DW_AT_name {{.*}} "a"
-CHECK: DW_TAG_structure_type
-CHECK: DW_AT_signature {{.*}} ([[FOOSIG:.*]])
-
-CHECK: [[BOFF]]:
-CHECK-LABEL: Compile Unit: length = 0x00000035 version = 0x0004 abbr_offset =
-CHECK: 0x[[BAOFF]] addr_size = 0x08 (next unit at [[XOFF:.*]])
-CHECK: DW_AT_name {{.*}} "b.cpp"
-CHECK: DW_AT_GNU_dwo_id {{.*}} ([[DWOB:.*]])
-CHECK: DW_TAG_structure_type
-CHECK: DW_AT_signature {{.*}} ([[BARSIG:.*]])
-CHECK: DW_TAG_subprogram
-CHECK: DW_AT_name {{.*}} "b"
-CHECK: DW_TAG_formal_parameter
-
-CHECK-LABEL: .debug_types.dwo contents:
-CHECK: [[FOOUOFF:0x[0-9a-f]*]]:
-CHECK-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset =
-CHECK: 0x[[AAOFF]] addr_size = 0x08 type_signature = [[FOOSIG]] type_offset = 0x[[FOOOFF:.*]] (next unit at [[BARUOFF:.*]])
-CHECK: DW_TAG_type_unit
-CHECK: [[FOOOFF]]: DW_TAG_structure_type
-CHECK: DW_AT_name {{.*}} "foo"
-CHECK: [[BARUOFF]]:
-CHECK-LABEL: Type Unit: length = 0x00000020 version = 0x0004 abbr_offset =
-CHECK: 0x[[BAOFF]] addr_size = 0x08 type_signature = [[BARSIG]] type_offset = 0x001e (next unit at [[XUOFF:.*]])
-CHECK: DW_TAG_type_unit
-CHECK: 0x00000042: DW_TAG_structure_type
-CHECK: DW_AT_name {{.*}} "bar"
-
-CHECK-LABEL: .debug_cu_index contents:
-CHECK: Index Signature INFO ABBREV LINE STR_OFFSETS
-CHECK: 1 [[DWOA]] {{\[}}[[AOFF]], [[BOFF]]) [0x0000[[AAOFF]], 0x0000[[BAOFF]]) [0x00000000, 0x0000001a) [0x00000000, 0x00000010)
-CHECK: 3 [[DWOB]] {{\[}}[[BOFF]], [[XOFF]]) [0x0000[[BAOFF]], 0x00000099) [0x0000001a, 0x00000034) [0x00000010, 0x00000024)
-
-CHECK-LABEL: .debug_tu_index contents:
-CHECK: Index Signature TYPES ABBREV LINE STR_OFFSETS
-CHECK: 1 [[FOOSIG]] {{\[}}[[FOOUOFF]], [[BARUOFF]]) [0x0000[[AAOFF]], 0x0000[[BAOFF]]) [0x00000000, 0x0000001a) [0x00000000, 0x00000010)
-CHECK: 4 [[BARSIG]] {{\[}}[[BARUOFF]], [[XUOFF]]) [0x0000[[BAOFF]], 0x00000099) [0x0000001a, 0x00000034) [0x00000010, 0x00000024)
-
-CHECK-LABEL: .debug_str.dwo contents:
-CHECK: "clang version
-CHECK: 0x[[ACPP:.*]]: "a.cpp"
-CHECK-NOT: "clang version
-CHECK: 0x[[BCPP:.*]]: "b.cpp"
-
-CHECK-LABEL: .debug_str_offsets.dwo contents:
-CHECK: : 00000000
-CHECK: : [[ACPP]]
-CHECK: : 00000000
-CHECK: : [[BCPP]]
Modified: llvm/trunk/tools/llvm-dwp/llvm-dwp.cpp
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/tools/llvm-dwp/llvm-dwp.cpp?rev=254833&r1=254832&r2=254833&view=diff
==============================================================================
--- llvm/trunk/tools/llvm-dwp/llvm-dwp.cpp (original)
+++ llvm/trunk/tools/llvm-dwp/llvm-dwp.cpp Fri Dec 4 21:41:53 2015
@@ -310,11 +310,13 @@ static std::error_code write(MCStreamer
return Err;
}
- // Lie about there being no info contributions so the TU index only includes
- // the type unit contribution
- ContributionOffsets[0] = 0;
- writeIndex(Out, MCOFI.getDwarfTUIndexSection(), ContributionOffsets,
- TypeIndexEntries);
+ if (!TypeIndexEntries.empty()) {
+ // Lie about there being no info contributions so the TU index only includes
+ // the type unit contribution
+ ContributionOffsets[0] = 0;
+ writeIndex(Out, MCOFI.getDwarfTUIndexSection(), ContributionOffsets,
+ TypeIndexEntries);
+ }
// Lie about the type contribution
ContributionOffsets[DW_SECT_TYPES - DW_SECT_INFO] = 0;
More information about the llvm-commits
mailing list