This is an archive of the discontinued LLVM Phabricator instance.

Differential D118517

[BOLT][DWARF] Handle shared abbrev section
ClosedPublic

Authored by ayermolo on Jan 28 2022, 4:33 PM.

Details

Reviewers
rafauler
Amir
maksfb
Commits
rG9f3f9d19c7ed: [BOLT][DWARF] Handle shared abbrev section
Summary

We can have a scenario where multiple CUs share an abbrev table.
We modify or don't modify one CU, which leads to other CUs having invalid abbrev section.
Example that caused it.
All of CUs shared the same abbrev table. First CU just had compile_unit and sub_program.
It was not modified. Next CU had DW_TAG_lexical_block with
DW_AT_low_pc/DW_AT_high_pc converted to DW_AT_low_pc/DW_AT_ranges.
We used unmodified abbrev section for first and subsequent CUs.
So when parsing subsequent CUs debug info was corrupted.

In this patch we will now duplicate all sections that are modified and are different.
This also means that if .debug_types is present and it shares Abbrev table, and
they usually are, we now can have two Abbrev tables. One for CU that was modified,
and unmodified one for TU.

Diff Detail

Event Timeline

ayermolo created this revision.Jan 28 2022, 4:33 PM
Herald added a reviewer: rafauler. · View Herald TranscriptJan 28 2022, 4:33 PM
Herald added a reviewer: Amir. · View Herald Transcript
Herald added a reviewer: maksfb. · View Herald Transcript
Herald added subscribers: hoy, modimo, wenlei, arphaman. · View Herald Transcript
ayermolo requested review of this revision.Jan 28 2022, 4:33 PM
Herald added a project: Restricted Project. · View Herald TranscriptJan 28 2022, 4:33 PM
Herald added subscribers: llvm-commits, yota9. · View Herald Transcript
Amir added a comment.Jan 28 2022, 5:05 PM

Is the input bolt/test/X86/Inputs/dwarfdump-gdbindex-v7.elf-x86-64.yaml still used?

bolt/include/bolt/Core/DebugData.h
725

Better to use llvm::StringMap in this case. It probably doesn't remove the need for llvm::SHA1 Hasher: StringMap will hash the key internally, but still store it.

ayermolo added a comment.Jan 28 2022, 5:11 PM
In D118517#3281142, @Amir wrote:

Is the input bolt/test/X86/Inputs/dwarfdump-gdbindex-v7.elf-x86-64.yaml still used?

No

ayermolo updated this revision to Diff 404201.Jan 28 2022, 5:25 PM

addressed comment

Harbormaster completed remote builds in B146409: Diff 404201.Jan 28 2022, 6:33 PM
maksfb accepted this revision.Jan 31 2022, 9:59 AM

LGTM

This revision is now accepted and ready to land.Jan 31 2022, 9:59 AM
This revision was landed with ongoing or failed builds.Jan 31 2022, 11:10 AM
Closed by commit rG9f3f9d19c7ed: [BOLT][DWARF] Handle shared abbrev section (authored by ayermolo). · Explain Why
This revision was automatically updated to reflect the committed changes.
ayermolo marked an inline comment as done.
ayermolo added a commit: rG9f3f9d19c7ed: [BOLT][DWARF] Handle shared abbrev section.

Revision Contents

PathSize
bolt/
include/
bolt/
Core/
13 lines
lib/
Core/
77 lines
test/
X86/
Inputs/
134 lines
121 lines

Diff 404196

bolt/include/bolt/Core/DebugData.h

Show First 20 Lines • Show All 712 Lines • ▼ Show 20 Linesclass DebugAbbrevWriter {
std::vector<uint64_t> AbbrevSetOffsets; std::vector<uint64_t> AbbrevSetOffsets;
/// Abbrev data set for a single unit. /// Abbrev data set for a single unit.
struct AbbrevData { struct AbbrevData {
uint64_t Offset{0}; ///< Offset of the data in the final section. uint64_t Offset{0}; ///< Offset of the data in the final section.
std::unique_ptr<DebugBufferVector> Buffer; std::unique_ptr<DebugBufferVector> Buffer;
std::unique_ptr<raw_svector_ostream> Stream; std::unique_ptr<raw_svector_ostream> Stream;
}; };
/// Map original unit abbrev offset to abbreviations data. /// Map original unit to abbreviations data.
std::map<uint64_t, AbbrevData> UnitsAbbrevData; std::unordered_map<const DWARFUnit *, AbbrevData *> UnitsAbbrevData;
/// Map from Hash Signature to AbbrevData.
std::unordered_map<std::string, std::unique_ptr<AbbrevData>> AbbrevDataCache;
AmirUnsubmitted
Done
ReplyInline Actions

Better to use llvm::StringMap in this case. It probably doesn't remove the need for llvm::SHA1 Hasher: StringMap will hash the key internally, but still store it.

Amir: Better to use `llvm::StringMap` in this case. It probably doesn't remove the need for llvm…
/// Attributes substitution (patch) information. /// Attributes substitution (patch) information.
struct PatchInfo { struct PatchInfo {
dwarf::Attribute OldAttr; dwarf::Attribute OldAttr;
dwarf::Attribute NewAttr; dwarf::Attribute NewAttr;
uint8_t NewAttrForm; uint8_t NewAttrForm;
}; };
▲ Show 20 Lines • Show All 50 Lines • ▼ Show 20 Linespublic:
/// in the associated DWARF context. Section offsets could be queried using /// in the associated DWARF context. Section offsets could be queried using
/// getAbbreviationsOffsetForUnit() interface. For DWP, we are using DWOId /// getAbbreviationsOffsetForUnit() interface. For DWP, we are using DWOId
/// to return only that unit's contribution to abbrev section. /// to return only that unit's contribution to abbrev section.
std::unique_ptr<DebugBufferVector> finalize(); std::unique_ptr<DebugBufferVector> finalize();
/// Return an offset in the finalized abbrev section corresponding to CU/TU. /// Return an offset in the finalized abbrev section corresponding to CU/TU.
uint64_t getAbbreviationsOffsetForUnit(const DWARFUnit &Unit) { uint64_t getAbbreviationsOffsetForUnit(const DWARFUnit &Unit) {
assert(!DWOId && "offsets are tracked for non-DWO units only"); assert(!DWOId && "offsets are tracked for non-DWO units only");
assert(UnitsAbbrevData.find(Unit.getAbbreviationsOffset()) != assert(UnitsAbbrevData.count(&Unit) && "no abbrev data found for unit");
UnitsAbbrevData.end() && return UnitsAbbrevData[&Unit]->Offset;
"no abbrev data found for unit");
return UnitsAbbrevData[Unit.getAbbreviationsOffset()].Offset;
} }
}; };
/// Similar to MCDwarfLineEntry, but identifies the location by its address /// Similar to MCDwarfLineEntry, but identifies the location by its address
/// instead of MCLabel. /// instead of MCLabel.
class BinaryDwarfLineEntry : public MCDwarfLoc { class BinaryDwarfLineEntry : public MCDwarfLoc {
uint64_t Address; uint64_t Address;
▲ Show 20 Lines • Show All 90 Lines • Show Last 20 Lines

bolt/lib/Core/DebugData.cpp

Show All 13 Lines
#include "bolt/Core/BinaryBasicBlock.h" #include "bolt/Core/BinaryBasicBlock.h"
#include "bolt/Core/BinaryFunction.h" #include "bolt/Core/BinaryFunction.h"
#include "bolt/Utils/Utils.h" #include "bolt/Utils/Utils.h"
#include "llvm/MC/MCObjectStreamer.h" #include "llvm/MC/MCObjectStreamer.h"
#include "llvm/MC/MCSymbol.h" #include "llvm/MC/MCSymbol.h"
#include "llvm/Support/CommandLine.h" #include "llvm/Support/CommandLine.h"
#include "llvm/Support/EndianStream.h" #include "llvm/Support/EndianStream.h"
#include "llvm/Support/LEB128.h" #include "llvm/Support/LEB128.h"
#include "llvm/Support/SHA1.h"
#include <algorithm> #include <algorithm>
#include <cassert> #include <cassert>
#include <cstdint> #include <cstdint>
#include <limits> #include <limits>
#include <unordered_map> #include <unordered_map>
#define DEBUG_TYPE "bolt-debug-info" #define DEBUG_TYPE "bolt-debug-info"
▲ Show 20 Lines • Show All 658 Lines • ▼ Show 20 Linesuint32_t DebugStrWriter::addString(StringRef Str) {
return Offset; return Offset;
} }
void DebugAbbrevWriter::addUnitAbbreviations(DWARFUnit &Unit) { void DebugAbbrevWriter::addUnitAbbreviations(DWARFUnit &Unit) {
const DWARFAbbreviationDeclarationSet *Abbrevs = Unit.getAbbreviations(); const DWARFAbbreviationDeclarationSet *Abbrevs = Unit.getAbbreviations();
if (!Abbrevs) if (!Abbrevs)
return; return;
// Multiple units may share the same abbreviations. Only add abbreviations const PatchesTy &UnitPatches = Patches[&Unit];
// for the first unit and reuse them.
const uint64_t AbbrevOffset = Unit.getAbbreviationsOffset();
if (UnitsAbbrevData.find(AbbrevOffset) != UnitsAbbrevData.end())
return;
AbbrevData &UnitData = UnitsAbbrevData[AbbrevOffset]; // We are duplicating abbrev sections, to handle the case where for one CU we
// modify it, but for another we don't.
auto UnitDataPtr = std::make_unique<AbbrevData>();
AbbrevData &UnitData = *UnitDataPtr.get();
UnitData.Buffer = std::make_unique<DebugBufferVector>(); UnitData.Buffer = std::make_unique<DebugBufferVector>();
UnitData.Stream = std::make_unique<raw_svector_ostream>(*UnitData.Buffer); UnitData.Stream = std::make_unique<raw_svector_ostream>(*UnitData.Buffer);
const PatchesTy &UnitPatches = Patches[&Unit];
raw_svector_ostream &OS = *UnitData.Stream.get(); raw_svector_ostream &OS = *UnitData.Stream.get();
// Returns true if AbbrevData is re-used, false otherwise.
auto hashAndAddAbbrev = [&](StringRef AbbrevData) -> bool {
llvm::SHA1 Hasher;
Hasher.update(AbbrevData);
std::string Key = Hasher.final().str();
auto Iter = AbbrevDataCache.find(Key);
if (Iter != AbbrevDataCache.end()) {
UnitsAbbrevData[&Unit] = Iter->second.get();
return true;
}
AbbrevDataCache[Key] = std::move(UnitDataPtr);
UnitsAbbrevData[&Unit] = &UnitData;
return false;
};
// Take a fast path if there are no patches to apply. Simply copy the original // Take a fast path if there are no patches to apply. Simply copy the original
// contents. // contents.
if (UnitPatches.empty()) { if (UnitPatches.empty()) {
StringRef AbbrevSectionContents = StringRef AbbrevSectionContents =
Unit.isDWOUnit() ? Unit.getContext().getDWARFObj().getAbbrevDWOSection() Unit.isDWOUnit() ? Unit.getContext().getDWARFObj().getAbbrevDWOSection()
: Unit.getContext().getDWARFObj().getAbbrevSection(); : Unit.getContext().getDWARFObj().getAbbrevSection();
StringRef AbbrevContents; StringRef AbbrevContents;
Show All 32 Lines if (!CUIndex.getRows().empty()) {
It == AbbrevSetOffsets.end() ? AbbrevSectionContents.size() : *It; It == AbbrevSetOffsets.end() ? AbbrevSectionContents.size() : *It;
AbbrevContents = AbbrevSectionContents.slice(StartOffset, EndOffset); AbbrevContents = AbbrevSectionContents.slice(StartOffset, EndOffset);
} else { } else {
// For DWO unit outside of DWP, we expect the entire section to hold // For DWO unit outside of DWP, we expect the entire section to hold
// abbreviations for this unit only. // abbreviations for this unit only.
AbbrevContents = AbbrevSectionContents; AbbrevContents = AbbrevSectionContents;
} }
if (!hashAndAddAbbrev(AbbrevContents)) {
OS.reserveExtraSpace(AbbrevContents.size()); OS.reserveExtraSpace(AbbrevContents.size());
OS << AbbrevContents; OS << AbbrevContents;
}
return; return;
} }
for (auto I = Abbrevs->begin(), E = Abbrevs->end(); I != E; ++I) { for (auto I = Abbrevs->begin(), E = Abbrevs->end(); I != E; ++I) {
const DWARFAbbreviationDeclaration &Abbrev = *I; const DWARFAbbreviationDeclaration &Abbrev = *I;
auto Patch = UnitPatches.find(&Abbrev); auto Patch = UnitPatches.find(&Abbrev);
encodeULEB128(Abbrev.getCode(), OS); encodeULEB128(Abbrev.getCode(), OS);
Show All 23 Lines for (const DWARFAbbreviationDeclaration::AttributeSpec &AttrSpec :
if (AttrSpec.isImplicitConst()) if (AttrSpec.isImplicitConst())
encodeSLEB128(AttrSpec.getImplicitConstValue(), OS); encodeSLEB128(AttrSpec.getImplicitConstValue(), OS);
} }
encodeULEB128(0, OS); encodeULEB128(0, OS);
encodeULEB128(0, OS); encodeULEB128(0, OS);
} }
encodeULEB128(0, OS); encodeULEB128(0, OS);
hashAndAddAbbrev(OS.str());
} }
std::unique_ptr<DebugBufferVector> DebugAbbrevWriter::finalize() { std::unique_ptr<DebugBufferVector> DebugAbbrevWriter::finalize() {
// Used to create determinism for writing out abbrevs.
std::vector<AbbrevData *> Abbrevs;
if (DWOId) { if (DWOId) {
// We expect abbrev_offset to always be zero for DWO units as there // We expect abbrev_offset to always be zero for DWO units as there
// should be one CU per DWO, and TUs should share the same abbreviation // should be one CU per DWO, and TUs should share the same abbreviation
// set with the CU. // set with the CU.
// For DWP AbbreviationsOffset is an Abbrev contribution in the DWP file, so // For DWP AbbreviationsOffset is an Abbrev contribution in the DWP file, so
// can be none zero. Thus we are skipping the check for DWP. // can be none zero. Thus we are skipping the check for DWP.
bool IsDWP = !Context.getCUIndex().getRows().empty(); bool IsDWP = !Context.getCUIndex().getRows().empty();
if (!IsDWP) { if (!IsDWP) {
for (const std::unique_ptr<DWARFUnit> &Unit : Context.dwo_units()) { for (const std::unique_ptr<DWARFUnit> &Unit : Context.dwo_units()) {
if (Unit->getAbbreviationsOffset() != 0) { if (Unit->getAbbreviationsOffset() != 0) {
errs() << "BOLT-ERROR: detected DWO unit with non-zero abbr_offset. " errs() << "BOLT-ERROR: detected DWO unit with non-zero abbr_offset. "
"Unable to update debug info.\n"; "Unable to update debug info.\n";
exit(1); exit(1);
} }
} }
} }
DWARFUnit *Unit = Context.getDWOCompileUnitForHash(*DWOId);
// Issue abbreviations for the DWO CU only. // Issue abbreviations for the DWO CU only.
addUnitAbbreviations(*Context.getDWOCompileUnitForHash(*DWOId)); addUnitAbbreviations(*Unit);
AbbrevData *Abbrev = UnitsAbbrevData[Unit];
Abbrevs.push_back(Abbrev);
} else { } else {
Abbrevs.reserve(Context.getNumCompileUnits() + Context.getNumTypeUnits());
std::unordered_set<AbbrevData *> ProcessedAbbrevs;
// Add abbreviations from compile and type non-DWO units. // Add abbreviations from compile and type non-DWO units.
for (const std::unique_ptr<DWARFUnit> &Unit : Context.normal_units()) for (const std::unique_ptr<DWARFUnit> &Unit : Context.normal_units()) {
addUnitAbbreviations(*Unit); addUnitAbbreviations(*Unit);
AbbrevData *Abbrev = UnitsAbbrevData[Unit.get()];
if (!ProcessedAbbrevs.insert(Abbrev).second)
continue;
Abbrevs.push_back(Abbrev);
}
} }
DebugBufferVector ReturnBuffer; DebugBufferVector ReturnBuffer;
// Pre-calculate the total size of abbrev section. // Pre-calculate the total size of abbrev section.
uint64_t Size = 0; uint64_t Size = 0;
for (const auto &KV : UnitsAbbrevData) { for (const AbbrevData *UnitData : Abbrevs)
const AbbrevData &UnitData = KV.second; Size += UnitData->Buffer->size();
Size += UnitData.Buffer->size();
}
ReturnBuffer.reserve(Size); ReturnBuffer.reserve(Size);
uint64_t Pos = 0; uint64_t Pos = 0;
for (auto &KV : UnitsAbbrevData) { for (AbbrevData *UnitData : Abbrevs) {
AbbrevData &UnitData = KV.second; ReturnBuffer.append(*UnitData->Buffer);
ReturnBuffer.append(*UnitData.Buffer); UnitData->Offset = Pos;
UnitData.Offset = Pos; Pos += UnitData->Buffer->size();
Pos += UnitData.Buffer->size();
UnitData.Buffer.reset(); UnitData->Buffer.reset();
UnitData.Stream.reset(); UnitData->Stream.reset();
} }
return std::make_unique<DebugBufferVector>(ReturnBuffer); return std::make_unique<DebugBufferVector>(ReturnBuffer);
} }
static void emitDwarfSetLineAddrAbs(MCStreamer &OS, static void emitDwarfSetLineAddrAbs(MCStreamer &OS,
MCDwarfLineTableParams Params, MCDwarfLineTableParams Params,
int64_t LineDelta, uint64_t Address, int64_t LineDelta, uint64_t Address,
▲ Show 20 Lines • Show All 262 Lines • Show Last 20 Lines

bolt/test/X86/Inputs/dwarfdump-gdbindex-v7.elf-x86-64.yaml

  • This file was added.
--- !ELF
FileHeader:
Class: ELFCLASS64
Data: ELFDATA2LSB
Type: ET_EXEC
Machine: EM_X86_64
ProgramHeaders:
- Type: PT_LOAD
Flags: [ PF_X, PF_R ]
FirstSec: .text
LastSec: .eh_frame
VAddr: 0x400000
Align: 0x1000
- Type: PT_LOAD
Flags: [ PF_W, PF_R ]
FirstSec: .data
LastSec: .bss
VAddr: 0x401000
Align: 0x1000
- Type: PT_GNU_STACK
Flags: [ PF_W, PF_R ]
Align: 0x0
Sections:
- Name: .text
Type: SHT_PROGBITS
Flags: [ SHF_ALLOC, SHF_EXECINSTR ]
Address: 0x4000E8
AddressAlign: 0x1
Content: 554889E5B8000000005DC3554889E5B8000000005DC3
- Name: .eh_frame
Type: SHT_PROGBITS
Flags: [ SHF_ALLOC ]
Address: 0x400100
AddressAlign: 0x8
Content: 1400000000000000017A5200017810011B0C0708900100001C0000001C000000C8FFFFFF0B00000000410E108602430D06460C07080000001C0000003C000000B3FFFFFF0B00000000410E108602430D06460C0708000000
- Name: .data
Type: SHT_PROGBITS
Flags: [ SHF_WRITE, SHF_ALLOC ]
Address: 0x401000
AddressAlign: 0x1
Offset: 0x1000
- Name: .bss
Type: SHT_NOBITS
Flags: [ SHF_WRITE, SHF_ALLOC ]
Address: 0x401000
AddressAlign: 0x1
- Name: .debug_addr
Type: SHT_PROGBITS
AddressAlign: 0x1
Content: E800400000000000F300400000000000
- Name: .debug_info
Type: SHT_PROGBITS
AddressAlign: 0x1
Content: 300000000400000000000801E8004000000000000B00000000000000000000000000000009000000000000002FBA8B66E3F5A8E03000000004001A0000000801F3004000000000000B000000000000003B000000260000000900000008000000C31C2F0C7709348D
- Name: .debug_abbrev
Type: SHT_PROGBITS
AddressAlign: 0x1
Content: 011100110112071017B0420E1B0EB44219B34217B14207000000011100110112071017B0420E1B0EB44219B34217B14207000000
- Name: .debug_line
Type: SHT_PROGBITS
AddressAlign: 0x1
Content: 3700000002001F0000000101FB0E0D00010101010000000100000100746573742E6370700000000000000902E800400000000000014A0207000101380000000200200000000101FB0E0D0001010101000000010000010074657374322E6370700000000000000902F300400000000000014A0207000101
- Name: .comment
Type: SHT_PROGBITS
Flags: [ SHF_MERGE, SHF_STRINGS ]
AddressAlign: 0x1
EntSize: 0x1
Content: 004743433A20285562756E747520352E342E302D367562756E7475317E31362E30342E322920352E342E3020323031363036303900
- Name: .note.gnu.gold-version
Type: SHT_NOTE
AddressAlign: 0x4
Notes:
- Name: GNU
Desc: 676F6C6420312E3131
Type: NT_TASKSTRUCT
- Name: .gdb_index
Type: SHT_PROGBITS
AddressAlign: 0x4
Offset: 0x1748
Content: 0700000018000000380000003800000060000000602000000000000000000000340000000000000034000000000000003400000000000000E800400000000000F30040000000000000000000F300400000000000FE00400000000000010000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001D0000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000022000000080000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000002600000014000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000000000300200000000000090010000900100000001000030006D61696E00696E74006D61696E3200
- Type: SectionHeaderTable
Sections:
- Name: .text
- Name: .eh_frame
- Name: .data
- Name: .bss
- Name: .debug_addr
- Name: .debug_info
- Name: .debug_abbrev
- Name: .debug_line
- Name: .debug_str
- Name: .comment
- Name: .gdb_index
- Name: .note.gnu.gold-version
- Name: .symtab
- Name: .strtab
- Name: .shstrtab
Symbols:
- Name: test.cpp
Type: STT_FILE
Index: SHN_ABS
- Name: test2.cpp
Type: STT_FILE
Index: SHN_ABS
- Name: main
Type: STT_FUNC
Section: .text
Binding: STB_GLOBAL
Value: 0x4000E8
Size: 0xB
- Name: _Z5main2v
Type: STT_FUNC
Section: .text
Binding: STB_GLOBAL
Value: 0x4000F3
Size: 0xB
- Name: _edata
Index: SHN_ABS
Binding: STB_GLOBAL
Value: 0x401000
- Name: __bss_start
Index: SHN_ABS
Binding: STB_GLOBAL
Value: 0x401000
- Name: _end
Index: SHN_ABS
Binding: STB_GLOBAL
Value: 0x401000
DWARF:
debug_str:
- test.dwo
- '/home/umb/tests/93splitdebug'
- test2.dwo
...

bolt/test/X86/shared-abbrev.s

  • This file was added.
# RUN: rm -rf %t
# RUN: mkdir %t
# RUN: llvm-mc -filetype=obj -triple=x86_64 -dwarf-version=4 %s -o %t/shared-abbrev.o
# RUN: %clang %cflags %t/shared-abbrev.o -o %t/shared-abbrev.exe
# RUN: llvm-bolt %t/shared-abbrev.exe -o %t/shared-abbrev.exe.bolt -update-debug-sections
# RUN: llvm-dwarfdump --debug-info %t/shared-abbrev.exe.bolt | FileCheck %s
# CHECK: 0x00000000:
# CHECK-SAME: abbr_offset = 0x0000
# CHECK-EMPTY:
# CHECK-NEXT: DW_TAG_compile_unit
# CHECK-NEXT: DW_AT_stmt_list
# CHECK-NEXT: DW_AT_low_pc
# CHECK-NEXT: DW_AT_ranges
# CHECK: 0x0000001d:
# CHECK-SAME: abbr_offset = 0x0017
# CHECK-EMPTY:
# CHECK: DW_TAG_compile_unit
# CHECK-NEXT: DW_AT_stmt_list
# CHECK-NEXT: DW_AT_low_pc
# CHECK-NEXT: DW_AT_ranges
# CHECK: 0x0000003a:
# CHECK-SAME: abbr_offset = 0x0000
# CHECK-EMPTY:
# CHECK-NEXT: DW_TAG_compile_unit
# CHECK-NEXT: DW_AT_stmt_list
# CHECK-NEXT: DW_AT_low_pc
# CHECK-NEXT: DW_AT_ranges
.text
.file "main.cpp"
.globl main # -- Begin function main
.p2align 4, 0x90
.type main,@function
main: # @main
.Lfunc_begin0:
.file 1 "test" "main.cpp"
.loc 1 1 0 # main.cpp:1:0
.cfi_startproc
.cfi_def_cfa %rsp, 8
retq
.Ltmp1:
.Lfunc_end0:
.size main, .Lfunc_end0-main
.cfi_endproc
# -- End function
.section .debug_abbrev,"",@progbits
.byte 1 # Abbreviation Code
.byte 17 # DW_TAG_compile_unit
.byte 0 # DW_CHILDREN_no
.byte 16 # DW_AT_stmt_list
.byte 23 # DW_FORM_sec_offset
.byte 17 # DW_AT_low_pc
.byte 1 # DW_FORM_addr
.byte 18 # DW_AT_high_pc
.byte 7 # DW_FORM_data8
.byte 0 # EOM(1)
.byte 0 # EOM(2)
.byte 2 # Abbreviation Code
.byte 17 # DW_TAG_compile_unit
.byte 0 # DW_CHILDREN_no
.byte 16 # DW_AT_stmt_list
.byte 23 # DW_FORM_sec_offset
.byte 17 # DW_AT_low_pc
.byte 1 # DW_FORM_addr
.byte 85 # DW_AT_ranges
.byte 23 # DW_FORM_sec_offset
.byte 0 # EOM(1)
.byte 0 # EOM(2)
.byte 0 # EOM(3)
.section .debug_info,"",@progbits
.Lcu_begin0:
.long .Ldebug_info_end0-.Ldebug_info_start0 # Length of Unit
.Ldebug_info_start0:
.short 4 # DWARF version number
.long .debug_abbrev # Offset Into Abbrev. Section
.byte 8 # Address Size (in bytes)
.byte 2 # Abbrev [2] DW_TAG_compile_unit
.long .Lline_table_start0 # DW_AT_stmt_list
.quad 0 # DW_AT_low_pc
.byte 0 # End Of Children Mark
.long .Ldebug_ranges0 # DW_AT_ranges --- end manual --
.Ldebug_info_end0:
# Second CU table.
.long .Ldebug_info_end1-.Ldebug_info_start1 # Length of Unit
.Ldebug_info_start1:
.short 4 # DWARF version number
.long .debug_abbrev # Offset Into Abbrev. Section
.byte 8 # Address Size (in bytes)
.byte 1 # Abbrev [1] DW_TAG_compile_unit
.long .Lline_table_start0 # DW_AT_stmt_list
.quad .Lfunc_begin0 # DW_AT_low_pc
.quad .Lfunc_end0-.Lfunc_begin0 # DW_AT_high_pc
.byte 0 # End Of Children Mark
.Ldebug_info_end1:
# Third CU table.
.long .Ldebug_info_end2-.Ldebug_info_start2 # Length of Unit
.Ldebug_info_start2:
.short 4 # DWARF version number
.long .debug_abbrev # Offset Into Abbrev. Section
.byte 8 # Address Size (in bytes)
.byte 2 # Abbrev [2] DW_TAG_compile_unit
.long .Lline_table_start0 # DW_AT_stmt_list
.quad 0 # DW_AT_low_pc
.byte 0 # End Of Children Mark
.long .Ldebug_ranges0 # DW_AT_ranges --- end manual --
.Ldebug_info_end2:
.section .debug_ranges,"",@progbits
.Ldebug_ranges0:
.quad .Lfunc_begin0
.quad .Lfunc_end0
.quad .Lfunc_begin0
.quad .Lfunc_end0
.quad 0
.quad 0
.section ".note.GNU-stack","",@progbits
.addrsig
.section .debug_line,"",@progbits
.Lline_table_start0: