replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

llvm-dwp: Include the dwo name (if available) when diagnosing duplicate CU IDs from dwp input files 

If you're building dwps from other dwps, it can be hard to track down a
duplicate CU ID if it comes from two compilations of the same file in
different modes, etc. By including the .dwo path (which is hopefully
more unique than the file path) it can help track down where the
duplicates came from.

llvm-svn: 264520
This commit is contained in:
David Blaikie 2016-03-26 20:32:14 +00:00
parent f43354f69c
commit 4dd03f0e12
5 changed files with 59 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
llvm/test/tools/llvm-dwp/Inputs/duplicate_dwo_name/ac.dwp Normal file
View File

Binary file not shown.

BIN
llvm/test/tools/llvm-dwp/Inputs/duplicate_dwo_name/bc.dwp Normal file
View File

Binary file not shown.

BIN
llvm/test/tools/llvm-dwp/Inputs/duplicate_dwo_name/c.dwo Normal file
View File

Binary file not shown.

27
llvm/test/tools/llvm-dwp/X86/duplicate.test
View File

@ -1,18 +1,27 @@
RUN: not llvm-dwp %p/../Inputs/duplicate/c.dwo %p/../Inputs/duplicate/c.dwo -o %t 2>&1 \ RUN: not llvm-dwp %p/../Inputs/duplicate/c.dwo %p/../Inputs/duplicate/c.dwo -o %t 2>&1 \
RUN: | FileCheck --check-prefix=CHECK %s RUN: | FileCheck --check-prefix=DWOS %s
RUN: not llvm-dwp %p/../Inputs/duplicate/c.dwo %p/../Inputs/duplicate/bc.dwp -o %t 2>&1 \ RUN: not llvm-dwp %p/../Inputs/duplicate/c.dwo %p/../Inputs/duplicate/bc.dwp -o %t 2>&1 \
RUN: | FileCheck --check-prefix=CHECK --check-prefix=DWP2 %s RUN: | FileCheck --check-prefix=2DWP %s
RUN: not llvm-dwp %p/../Inputs/duplicate/ac.dwp %p/../Inputs/duplicate/c.dwo -o %t 2>&1 \ RUN: not llvm-dwp %p/../Inputs/duplicate/ac.dwp %p/../Inputs/duplicate/c.dwo -o %t 2>&1 \
RUN: | FileCheck --check-prefix=CHECK --check-prefix=DWP1 %s RUN: | FileCheck --check-prefix=1DWP %s
RUN: not llvm-dwp %p/../Inputs/duplicate/ac.dwp %p/../Inputs/duplicate/bc.dwp -o %t 2>&1 \ RUN: not llvm-dwp %p/../Inputs/duplicate_dwo_name/c.dwo %p/../Inputs/duplicate_dwo_name/c.dwo -o %t 2>&1 \
RUN: | FileCheck --check-prefix=CHECK --check-prefix=DWP1 --check-prefix=DWP2 %s RUN: | FileCheck --check-prefix=DWODWOS %s
RUN: not llvm-dwp %p/../Inputs/duplicate_dwo_name/c.dwo %p/../Inputs/duplicate_dwo_name/bc.dwp -o %t 2>&1 \
RUN: | FileCheck --check-prefix=DWO2DWP %s
RUN: not llvm-dwp %p/../Inputs/duplicate_dwo_name/ac.dwp %p/../Inputs/duplicate_dwo_name/c.dwo -o %t 2>&1 \
RUN: | FileCheck --check-prefix=DWO1DWP %s
Build from a, b, and c.c all containing a single void() func by the name of the file. Build from a, b, and c.c all containing a single void() func by the name of the file.
CHECK: Duplicate DWO ID ({{.*}}) in 'c.c' DWOS: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c'{{$}}
DWP1-SAME: (from '{{.*}}ac.dwp') 1DWP: Duplicate DWO ID ({{.*}}) in 'c.c' (from '{{.*}}ac.dwp') and 'c.c'{{$}}
CHECK-SAME: and 'c.c' 2DWP: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c' (from '{{.*}}bc.dwp'){{$}}
DWP2-SAME: (from '{{.*}}bc.dwp')
DWODWOS: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c'{{$}}
DWO1DWP: Duplicate DWO ID ({{.*}}) in 'c.c' (from 'c.dwo' in '{{.*}}ac.dwp') and 'c.c'{{$}}
DWO2DWP: Duplicate DWO ID ({{.*}}) in 'c.c' and 'c.c' (from 'c.dwo' in '{{.*}}bc.dwp'){{$}}

61
llvm/tools/llvm-dwp/llvm-dwp.cpp
View File

@ -122,10 +122,19 @@ static uint32_t getCUAbbrev(StringRef Abbrev, uint64_t AbbrCode) {
struct CompileUnitIdentifiers { struct CompileUnitIdentifiers {
uint64_t Signature = 0; uint64_t Signature = 0;
const char *Name = nullptr; const char *Name = "";
const char *DWOName = nullptr; const char *DWOName = "";
}; };
static const char *getIndexedString(uint32_t StrIndex, StringRef StrOffsets,
StringRef Str) {
DataExtractor StrOffsetsData(StrOffsets, true, 0);
uint32_t StrOffsetsOffset = 4 * StrIndex;
uint32_t StrOffset = StrOffsetsData.getU32(&StrOffsetsOffset);
DataExtractor StrData(Str, true, 0);
return StrData.getCStr(&StrOffset);
}
static CompileUnitIdentifiers getCUIdentifiers(StringRef Abbrev, StringRef Info, static CompileUnitIdentifiers getCUIdentifiers(StringRef Abbrev, StringRef Info,
StringRef StrOffsets, StringRef StrOffsets,
StringRef Str) { StringRef Str) {
@ -154,13 +163,12 @@ static CompileUnitIdentifiers getCUIdentifiers(StringRef Abbrev, StringRef Info,
(Name != 0 || Form != 0)) { (Name != 0 || Form != 0)) {
switch (Name) { switch (Name) {
case dwarf::DW_AT_name: { case dwarf::DW_AT_name: {
auto StrIndex = InfoData.getULEB128(&Offset); ID.Name = getIndexedString(InfoData.getULEB128(&Offset), StrOffsets, Str);
break;
DataExtractor StrOffsetsData(StrOffsets, true, 0); }
uint32_t StrOffsetsOffset = 4 * StrIndex; case dwarf::DW_AT_GNU_dwo_name: {
uint32_t StrOffset = StrOffsetsData.getU32(&StrOffsetsOffset); ID.DWOName =
DataExtractor StrData(Str, true, 0); getIndexedString(InfoData.getULEB128(&Offset), StrOffsets, Str);
ID.Name = StrData.getCStr(&StrOffset);
break; break;
} }
case dwarf::DW_AT_GNU_dwo_id: case dwarf::DW_AT_GNU_dwo_id:
@ -176,6 +184,7 @@ static CompileUnitIdentifiers getCUIdentifiers(StringRef Abbrev, StringRef Info,
struct UnitIndexEntry { struct UnitIndexEntry {
DWARFUnitIndex::Entry::SectionContribution Contributions[8]; DWARFUnitIndex::Entry::SectionContribution Contributions[8];
std::string Name; std::string Name;
std::string DWOName;
StringRef DWPName; StringRef DWPName;
}; };
@ -331,6 +340,25 @@ static bool consumeCompressedDebugSectionHeader(StringRef &data,
return true; return true;
} }
void printDuplicateError(const std::pair<uint64_t, UnitIndexEntry> &PrevE,
const CompileUnitIdentifiers &ID, StringRef DWPName) {
errs() << "Duplicate DWO ID (" << PrevE.first << ") in '" << PrevE.second.Name
<< '\'';
if (!PrevE.second.DWPName.empty()) {
errs() << " (from ";
if (!PrevE.second.DWOName.empty())
errs() << '\'' << PrevE.second.DWOName << "' in ";
errs() << "'" << PrevE.second.DWPName.str() << "')";
}
errs() << " and '" << ID.Name << '\'';
if (!DWPName.empty()) {
errs() << " (from ";
if (*ID.DWOName)
errs() << '\'' << ID.DWOName << "\' in ";
errs() << '\'' << DWPName << "')";
}
errs() << '\n';
}
static std::error_code write(MCStreamer &Out, ArrayRef<std::string> Inputs) { static std::error_code write(MCStreamer &Out, ArrayRef<std::string> Inputs) {
const auto &MCOFI = *Out.getContext().getObjectFileInfo(); const auto &MCOFI = *Out.getContext().getObjectFileInfo();
MCSection *const StrSection = MCOFI.getDwarfStrDWOSection(); MCSection *const StrSection = MCOFI.getDwarfStrDWOSection();
@ -468,15 +496,12 @@ static std::error_code write(MCStreamer &Out, ArrayRef<std::string> Inputs) {
getSubsection(CurStrOffsetSection, E, DW_SECT_STR_OFFSETS), getSubsection(CurStrOffsetSection, E, DW_SECT_STR_OFFSETS),
CurStrSection); CurStrSection);
if (!P.second) { if (!P.second) {
auto &PrevE = *P.first; printDuplicateError(*P.first, ID, Input);
std::cerr << "Duplicate DWO ID (" << PrevE.first << ") in '" << PrevE.second.Name << "' ";
if (!PrevE.second.DWPName.empty())
std::cerr << "(from '" << PrevE.second.DWPName.str() << "') ";
std::cerr << "and '" << ID.Name << "' (from '" << Input << "')\n";
return make_error_code(std::errc::invalid_argument); return make_error_code(std::errc::invalid_argument);
} }
auto &NewEntry = P.first->second; auto &NewEntry = P.first->second;
NewEntry.Name = ID.Name; NewEntry.Name = ID.Name;
NewEntry.DWOName = ID.DWOName;
NewEntry.DWPName = Input; NewEntry.DWPName = Input;
for (auto Kind : CUIndex.getColumnKinds()) { for (auto Kind : CUIndex.getColumnKinds()) {
auto &C = NewEntry.Contributions[Kind - DW_SECT_INFO]; auto &C = NewEntry.Contributions[Kind - DW_SECT_INFO];
@ -503,15 +528,11 @@ static std::error_code write(MCStreamer &Out, ArrayRef<std::string> Inputs) {
AbbrevSection, InfoSection, CurStrOffsetSection, CurStrSection); AbbrevSection, InfoSection, CurStrOffsetSection, CurStrSection);
auto P = IndexEntries.insert(std::make_pair(ID.Signature, CurEntry)); auto P = IndexEntries.insert(std::make_pair(ID.Signature, CurEntry));
if (!P.second) { if (!P.second) {
auto &E = *P.first; printDuplicateError(*P.first, ID, "");
std::cerr << "Duplicate DWO ID (" << E.first << ") in '" << ID.Name
<< "' ";
if (!E.second.DWPName.empty())
std::cerr << "(from '" << E.second.DWPName.str() << "') ";
std::cerr << "and '" << E.second.Name << "'\n";
return make_error_code(std::errc::invalid_argument); return make_error_code(std::errc::invalid_argument);
} }
P.first->second.Name = ID.Name; P.first->second.Name = ID.Name;
P.first->second.DWOName = ID.DWOName;
addAllTypes(Out, TypeIndexEntries, TypesSection, CurTypesSection, addAllTypes(Out, TypeIndexEntries, TypesSection, CurTypesSection,
CurEntry, ContributionOffsets[DW_SECT_TYPES - DW_SECT_INFO]); CurEntry, ContributionOffsets[DW_SECT_TYPES - DW_SECT_INFO]);
} }