Skip to content

Commit d820d59

Browse files
committed
removed check for DWARF5, it will pre-load DWARF4 also.
1 parent 0e45f34 commit d820d59

File tree

2 files changed

+2
-8
lines changed

2 files changed

+2
-8
lines changed

llvm/lib/DebugInfo/DWARF/DWARFVerifier.cpp

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1930,22 +1930,18 @@ void DWARFVerifier::verifyNameIndexCompleteness(
19301930
static void extractCUsTus(DWARFContext &DCtx) {
19311931
// Abbrev DeclSet is shared beween the units.
19321932
for (auto &CUTU : DCtx.normal_units()) {
1933-
if (CUTU->getVersion() < 5)
1934-
continue;
19351933
CUTU->getUnitDIE();
19361934
CUTU->getBaseAddress();
19371935
}
19381936
parallelForEach(DCtx.normal_units(), [&](const auto &CUTU) {
1939-
if (CUTU->getVersion() < 5)
1940-
return;
19411937
if (Error E = CUTU->tryExtractDIEsIfNeeded(false))
19421938
DCtx.getRecoverableErrorHandler()(std::move(E));
19431939
});
19441940

19451941
// Invoking getNonSkeletonUnitDIE() sets up all the base pointers for DWO
19461942
// Units. This is needed for getBaseAddress().
19471943
for (const auto &CU : DCtx.compile_units()) {
1948-
if (!(CU->getVersion() >= 5 && CU->getDWOId()))
1944+
if (!CU->getDWOId())
19491945
continue;
19501946
DWARFContext &NonSkeletonContext =
19511947
CU->getNonSkeletonUnitDIE().getDwarfUnit()->getContext();

llvm/test/tools/llvm-dwarfdump/X86/verify_no_linkage_name.s

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,6 @@
11
# This test generates a DW_TAG_structure_type with a linkage name. This linkage
22
# name will not be part of the accelerator table and the verifier should not
33
# complain about this.
4-
# Technically speaking this test is invalid because .debug_names is a DWARF 5 feature.
5-
# In this test the accelerator table is referencing DWARF4.
64
#
75
# DW_TAG_structure_type
86
# DW_AT_name ("C")
@@ -11,7 +9,7 @@
119
# RUN: llvm-mc %s -filetype obj -triple x86_64-unknown-linux-gnu -o %t.o
1210
# RUN: llvm-dwarfdump -debug-info %t.o | FileCheck %s
1311
# RUN: llvm-dwarfdump -debug-names %t.o | FileCheck %s --check-prefix ACCEL
14-
# RUN: llvm-dwarfdump -verify --verify-num-threads 1 -debug-names %t.o
12+
# RUN: llvm-dwarfdump -verify -debug-names %t.o
1513

1614
# CHECK: DW_AT_name ("Bool")
1715
# CHECK-NEXT: DW_AT_linkage_name ("$SSbD")

0 commit comments

Comments
 (0)