[BOLT][DWARF] Update DW_AT_comp_dir/DW_AT_dwo_name for DWO TUs #91486
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Type unit DIE generated by clang contains DW_AT_comp_dir/DW_AT_dwo_name. This was added to clang to help LLDB to figure out where type unit come from when accessing an entry in a .debug_names accelerator table and type units in .dwp file. When BOLT writes out .dwo files it changes the name of them. User can also specify directory of where they can be written out. Added support to BOLT to update those attributes.
ayermolo
requested review from
aaupov,
maksfb,
rafaelauler and
dcci
as code owners
|
@llvm/pr-subscribers-bolt Author: Alexander Yermolovich (ayermolo) ChangesType unit DIE generated by clang contains DW_AT_comp_dir/DW_AT_dwo_name. This was added to clang to help LLDB to figure out where type unit come from when accessing an entry in a .debug_names accelerator table and type units in .dwp file. When BOLT writes out .dwo files it changes the name of them. User can also specify directory of where they can be written out. Added support to BOLT to update those attributes. Patch is 40.85 KiB, truncated to 20.00 KiB below, full version: https://github.com/llvm/llvm-project/pull/91486.diff 9 Files Affected:
diff --git a/bolt/include/bolt/Core/DIEBuilder.h b/bolt/include/bolt/Core/DIEBuilder.h
index 06084819ec0b3..0686ec03f4afb 100644
--- a/bolt/include/bolt/Core/DIEBuilder.h
+++ b/bolt/include/bolt/Core/DIEBuilder.h
@@ -129,6 +129,9 @@ class DIEBuilder {
uint64_t UnitSize{0};
llvm::DenseSet<uint64_t> AllProcessed;
DWARF5AcceleratorTable &DebugNamesTable;
+ // Unordered maps to handle name collision if output DWO directory is
+ // specified.
+ std::unordered_map<std::string, uint32_t> NameToIndexMap;
/// Returns current state of the DIEBuilder
State &getState() { return *BuilderState.get(); }
@@ -384,6 +387,17 @@ class DIEBuilder {
bool deleteValue(DIEValueList *Die, dwarf::Attribute Attribute) {
return Die->deleteValue(Attribute);
}
+ /// Updates DWO Name and Compilation direcotry for Skeleton CU \p Unit.
+ std::string updateDWONameCompDir(DebugStrOffsetsWriter &StrOffstsWriter,
+ DebugStrWriter &StrWriter,
+ DWARFUnit &SkeletonCU,
+ std::optional<StringRef> DwarfOutputPath,
+ std::optional<StringRef> DWONameToUse);
+ /// Updates DWO Name and Compilation direcotry for Type Units.
+ void updateDWONameCompDirForTypes(DebugStrOffsetsWriter &StrOffstsWriter,
+ DebugStrWriter &StrWriter, DWARFUnit &Unit,
+ std::optional<StringRef> DwarfOutputPath,
+ const StringRef DWOName);
};
} // namespace bolt
} // namespace llvm
diff --git a/bolt/include/bolt/Core/DebugData.h b/bolt/include/bolt/Core/DebugData.h
index 166bb3617e57f..b9e8c7583d9ad 100644
--- a/bolt/include/bolt/Core/DebugData.h
+++ b/bolt/include/bolt/Core/DebugData.h
@@ -430,7 +430,7 @@ class DebugAddrWriterDwarf5 : public DebugAddrWriter {
using DebugStrOffsetsBufferVector = SmallVector<char, 16>;
class DebugStrOffsetsWriter {
public:
- DebugStrOffsetsWriter() {
+ DebugStrOffsetsWriter(BinaryContext &BC) : BC(BC) {
StrOffsetsBuffer = std::make_unique<DebugStrOffsetsBufferVector>();
StrOffsetsStream = std::make_unique<raw_svector_ostream>(*StrOffsetsBuffer);
}
@@ -460,6 +460,11 @@ class DebugStrOffsetsWriter {
StrOffsets.clear();
}
+ /// Returns True if StrOffsets Section was modified.
+ bool isStrOffsetsSectionModified() const {
+ return StrOffsetSectionWasModified;
+ }
+
private:
std::unique_ptr<DebugStrOffsetsBufferVector> StrOffsetsBuffer;
std::unique_ptr<raw_svector_ostream> StrOffsetsStream;
@@ -467,13 +472,16 @@ class DebugStrOffsetsWriter {
SmallVector<uint32_t, 5> StrOffsets;
std::unordered_map<uint64_t, uint64_t> ProcessedBaseOffsets;
bool StrOffsetSectionWasModified = false;
+ BinaryContext &BC;
};
using DebugStrBufferVector = SmallVector<char, 16>;
class DebugStrWriter {
public:
DebugStrWriter() = delete;
- DebugStrWriter(BinaryContext &BC) : BC(BC) { create(); }
+ DebugStrWriter(DWARFContext &DwCtx, bool IsDWO) : DwCtx(DwCtx), IsDWO(IsDWO) {
+ create();
+ }
std::unique_ptr<DebugStrBufferVector> releaseBuffer() {
return std::move(StrBuffer);
}
@@ -495,7 +503,8 @@ class DebugStrWriter {
void create();
std::unique_ptr<DebugStrBufferVector> StrBuffer;
std::unique_ptr<raw_svector_ostream> StrStream;
- BinaryContext &BC;
+ DWARFContext &DwCtx;
+ bool IsDWO;
};
enum class LocWriterKind { DebugLocWriter, DebugLoclistWriter };
diff --git a/bolt/include/bolt/Rewrite/DWARFRewriter.h b/bolt/include/bolt/Rewrite/DWARFRewriter.h
index 12e0813d089d1..6b26ed9db5b28 100644
--- a/bolt/include/bolt/Rewrite/DWARFRewriter.h
+++ b/bolt/include/bolt/Rewrite/DWARFRewriter.h
@@ -203,13 +203,17 @@ class DWARFRewriter {
using OverriddenSectionsMap = std::unordered_map<DWARFSectionKind, StringRef>;
/// Output .dwo files.
void writeDWOFiles(DWARFUnit &, const OverriddenSectionsMap &,
- const std::string &, DebugLocWriter &);
+ const std::string &, DebugLocWriter &,
+ DebugStrOffsetsWriter &, DebugStrWriter &);
using KnownSectionsEntry = std::pair<MCSection *, DWARFSectionKind>;
struct DWPState {
std::unique_ptr<ToolOutputFile> Out;
std::unique_ptr<BinaryContext> TmpBC;
std::unique_ptr<MCStreamer> Streamer;
std::unique_ptr<DWPStringPool> Strings;
+ /// This is used to store String sections for .dwo files if they are being
+ /// modified.
+ std::vector<std::unique_ptr<DebugBufferVector>> StrSections;
const MCObjectFileInfo *MCOFI = nullptr;
const DWARFUnitIndex *CUIndex = nullptr;
std::deque<SmallString<32>> UncompressedSections;
@@ -230,7 +234,8 @@ class DWARFRewriter {
/// add content of dwo to .dwp file.
void updateDWP(DWARFUnit &, const OverriddenSectionsMap &, const UnitMeta &,
- UnitMetaVectorType &, DWPState &, DebugLocWriter &);
+ UnitMetaVectorType &, DWPState &, DebugLocWriter &,
+ DebugStrOffsetsWriter &, DebugStrWriter &);
};
} // namespace bolt
diff --git a/bolt/lib/Core/DIEBuilder.cpp b/bolt/lib/Core/DIEBuilder.cpp
index c4b0b251c1201..f2b42c8147cdf 100644
--- a/bolt/lib/Core/DIEBuilder.cpp
+++ b/bolt/lib/Core/DIEBuilder.cpp
@@ -22,6 +22,7 @@
#include "llvm/Support/Casting.h"
#include "llvm/Support/Debug.h"
#include "llvm/Support/ErrorHandling.h"
+#include "llvm/Support/FileSystem.h"
#include "llvm/Support/LEB128.h"
#include <algorithm>
@@ -41,6 +42,92 @@ extern cl::opt<unsigned> Verbosity;
namespace llvm {
namespace bolt {
+/// Returns DWO Name to be used. Handles case where user specifies output DWO
+/// directory, and there are duplicate names. Assumes DWO ID is unique.
+static std::string
+getDWOName(llvm::DWARFUnit &CU,
+ std::unordered_map<std::string, uint32_t> &NameToIndexMap,
+ std::optional<StringRef> &DwarfOutputPath) {
+ std::optional<uint64_t> DWOId = CU.getDWOId();
+ assert(DWOId && "DWO ID not found.");
+ (void)DWOId;
+
+ std::string DWOName = dwarf::toString(
+ CU.getUnitDIE().find({dwarf::DW_AT_dwo_name, dwarf::DW_AT_GNU_dwo_name}),
+ "");
+ assert(!DWOName.empty() &&
+ "DW_AT_dwo_name/DW_AT_GNU_dwo_name does not exists.");
+ if (DwarfOutputPath) {
+ DWOName = std::string(sys::path::filename(DWOName));
+ auto Iter = NameToIndexMap.find(DWOName);
+ if (Iter == NameToIndexMap.end())
+ Iter = NameToIndexMap.insert({DWOName, 0}).first;
+ DWOName.append(std::to_string(Iter->second));
+ ++Iter->second;
+ }
+ DWOName.append(".dwo");
+ return DWOName;
+}
+
+/// Adds a \p Str to .debug_str section.
+/// Uses \p AttrInfoVal to either update entry in a DIE for legacy DWARF using
+/// \p DebugInfoPatcher, or for DWARF5 update an index in .debug_str_offsets
+/// for this contribution of \p Unit.
+static void addStringHelper(DebugStrOffsetsWriter &StrOffstsWriter,
+ DebugStrWriter &StrWriter, DIEBuilder &DIEBldr,
+ DIE &Die, const DWARFUnit &Unit,
+ DIEValue &DIEAttrInfo, StringRef Str) {
+ uint32_t NewOffset = StrWriter.addString(Str);
+ if (Unit.getVersion() >= 5) {
+ StrOffstsWriter.updateAddressMap(DIEAttrInfo.getDIEInteger().getValue(),
+ NewOffset);
+ return;
+ }
+ DIEBldr.replaceValue(&Die, DIEAttrInfo.getAttribute(), DIEAttrInfo.getForm(),
+ DIEInteger(NewOffset));
+}
+
+std::string DIEBuilder::updateDWONameCompDir(
+ DebugStrOffsetsWriter &StrOffstsWriter, DebugStrWriter &StrWriter,
+ DWARFUnit &SkeletonCU, std::optional<StringRef> DwarfOutputPath,
+ std::optional<StringRef> DWONameToUse) {
+ DIE &UnitDIE = *getUnitDIEbyUnit(SkeletonCU);
+ DIEValue DWONameAttrInfo = UnitDIE.findAttribute(dwarf::DW_AT_dwo_name);
+ if (!DWONameAttrInfo)
+ DWONameAttrInfo = UnitDIE.findAttribute(dwarf::DW_AT_GNU_dwo_name);
+ if (!DWONameAttrInfo)
+ return "";
+ std::string ObjectName;
+ if (DWONameToUse)
+ ObjectName = *DWONameToUse;
+ else
+ ObjectName = getDWOName(SkeletonCU, NameToIndexMap, DwarfOutputPath);
+ addStringHelper(StrOffstsWriter, StrWriter, *this, UnitDIE, SkeletonCU,
+ DWONameAttrInfo, ObjectName);
+
+ DIEValue CompDirAttrInfo = UnitDIE.findAttribute(dwarf::DW_AT_comp_dir);
+ assert(CompDirAttrInfo && "DW_AT_comp_dir is not in Skeleton CU.");
+
+ if (DwarfOutputPath) {
+ if (!sys::fs::exists(*DwarfOutputPath))
+ sys::fs::create_directory(*DwarfOutputPath);
+ addStringHelper(StrOffstsWriter, StrWriter, *this, UnitDIE, SkeletonCU,
+ CompDirAttrInfo, *DwarfOutputPath);
+ }
+ return ObjectName;
+}
+
+void DIEBuilder::updateDWONameCompDirForTypes(
+ DebugStrOffsetsWriter &StrOffstsWriter, DebugStrWriter &StrWriter,
+ DWARFUnit &Unit, std::optional<StringRef> DwarfOutputPath,
+ const StringRef DWOName) {
+ for (DWARFUnit *DU : getState().DWARF5TUVector)
+ updateDWONameCompDir(StrOffstsWriter, StrWriter, *DU, DwarfOutputPath,
+ DWOName);
+ if (StrOffstsWriter.isStrOffsetsSectionModified())
+ StrOffstsWriter.finalizeSection(Unit, *this);
+}
+
void DIEBuilder::updateReferences() {
for (auto &[SrcDIEInfo, ReferenceInfo] : getState().AddrReferences) {
DIEInfo *DstDIEInfo = ReferenceInfo.Dst;
diff --git a/bolt/lib/Core/DebugData.cpp b/bolt/lib/Core/DebugData.cpp
index a987a103a08b9..7bfd9e883c325 100644
--- a/bolt/lib/Core/DebugData.cpp
+++ b/bolt/lib/Core/DebugData.cpp
@@ -31,6 +31,7 @@
#include <cstdint>
#include <functional>
#include <memory>
+#include <optional>
#include <unordered_map>
#include <vector>
@@ -867,10 +868,16 @@ void DebugStrOffsetsWriter::finalizeSection(DWARFUnit &Unit,
DIEBuilder &DIEBldr) {
std::optional<AttrInfo> AttrVal =
findAttributeInfo(Unit.getUnitDIE(), dwarf::DW_AT_str_offsets_base);
- if (!AttrVal)
+ if (!AttrVal && !Unit.isDWOUnit())
return;
- std::optional<uint64_t> Val = AttrVal->V.getAsSectionOffset();
- assert(Val && "DW_AT_str_offsets_base Value not present.");
+ std::optional<uint64_t> Val = std::nullopt;
+ if (AttrVal) {
+ Val = AttrVal->V.getAsSectionOffset();
+ } else {
+ if (!Unit.isDWOUnit())
+ BC.errs() << "DW_AT_str_offsets_base Value not present.\n";
+ Val = 0;
+ }
DIE &Die = *DIEBldr.getUnitDIEbyUnit(Unit);
DIEValue StrListBaseAttrInfo =
Die.findAttribute(dwarf::DW_AT_str_offsets_base);
@@ -915,7 +922,11 @@ void DebugStrWriter::create() {
}
void DebugStrWriter::initialize() {
- auto StrSection = BC.DwCtx->getDWARFObj().getStrSection();
+ StringRef StrSection;
+ if (IsDWO)
+ StrSection = DwCtx.getDWARFObj().getStrDWOSection();
+ else
+ StrSection = DwCtx.getDWARFObj().getStrSection();
(*StrStream) << StrSection;
}
diff --git a/bolt/lib/Rewrite/DWARFRewriter.cpp b/bolt/lib/Rewrite/DWARFRewriter.cpp
index 26e4889faadac..4ed3a507439eb 100644
--- a/bolt/lib/Rewrite/DWARFRewriter.cpp
+++ b/bolt/lib/Rewrite/DWARFRewriter.cpp
@@ -458,32 +458,6 @@ static std::optional<uint64_t> getAsAddress(const DWARFUnit &DU,
return std::nullopt;
}
-/// Returns DWO Name to be used. Handles case where user specifies output DWO
-/// directory, and there are duplicate names. Assumes DWO ID is unique.
-static std::string
-getDWOName(llvm::DWARFUnit &CU,
- std::unordered_map<std::string, uint32_t> &NameToIndexMap) {
- std::optional<uint64_t> DWOId = CU.getDWOId();
- assert(DWOId && "DWO ID not found.");
- (void)DWOId;
-
- std::string DWOName = dwarf::toString(
- CU.getUnitDIE().find({dwarf::DW_AT_dwo_name, dwarf::DW_AT_GNU_dwo_name}),
- "");
- assert(!DWOName.empty() &&
- "DW_AT_dwo_name/DW_AT_GNU_dwo_name does not exists.");
- if (!opts::DwarfOutputPath.empty()) {
- DWOName = std::string(sys::path::filename(DWOName));
- auto Iter = NameToIndexMap.find(DWOName);
- if (Iter == NameToIndexMap.end())
- Iter = NameToIndexMap.insert({DWOName, 0}).first;
- DWOName.append(std::to_string(Iter->second));
- ++Iter->second;
- }
- DWOName.append(".dwo");
- return DWOName;
-}
-
static std::unique_ptr<DIEStreamer>
createDIEStreamer(const Triple &TheTriple, raw_pwrite_stream &OutFile,
StringRef Swift5ReflectionSegmentName, DIEBuilder &DIEBldr,
@@ -515,7 +489,9 @@ static void emitDWOBuilder(const std::string &DWOName,
DIEBuilder &DWODIEBuilder, DWARFRewriter &Rewriter,
DWARFUnit &SplitCU, DWARFUnit &CU,
DWARFRewriter::DWPState &State,
- DebugLocWriter &LocWriter) {
+ DebugLocWriter &LocWriter,
+ DebugStrOffsetsWriter &StrOffstsWriter,
+ DebugStrWriter &StrWriter) {
// Populate debug_info and debug_abbrev for current dwo into StringRef.
DWODIEBuilder.generateAbbrevs();
DWODIEBuilder.finish();
@@ -577,54 +553,10 @@ static void emitDWOBuilder(const std::string &DWOName,
}
if (opts::WriteDWP)
Rewriter.updateDWP(CU, OverriddenSections, CUMI, TUMetaVector, State,
- LocWriter);
+ LocWriter, StrOffstsWriter, StrWriter);
else
- Rewriter.writeDWOFiles(CU, OverriddenSections, DWOName, LocWriter);
-}
-
-/// Adds a \p Str to .debug_str section.
-/// Uses \p AttrInfoVal to either update entry in a DIE for legacy DWARF using
-/// \p DebugInfoPatcher, or for DWARF5 update an index in .debug_str_offsets
-/// for this contribution of \p Unit.
-static void addStringHelper(DebugStrOffsetsWriter &StrOffstsWriter,
- DebugStrWriter &StrWriter, DIEBuilder &DIEBldr,
- DIE &Die, const DWARFUnit &Unit,
- DIEValue &DIEAttrInfo, StringRef Str) {
- uint32_t NewOffset = StrWriter.addString(Str);
- if (Unit.getVersion() >= 5) {
- StrOffstsWriter.updateAddressMap(DIEAttrInfo.getDIEInteger().getValue(),
- NewOffset);
- return;
- }
- DIEBldr.replaceValue(&Die, DIEAttrInfo.getAttribute(), DIEAttrInfo.getForm(),
- DIEInteger(NewOffset));
-}
-
-static std::string
-updateDWONameCompDir(DebugStrOffsetsWriter &StrOffstsWriter,
- DebugStrWriter &StrWriter,
- std::unordered_map<std::string, uint32_t> &NameToIndexMap,
- DWARFUnit &Unit, DIEBuilder &DIEBldr, DIE &UnitDIE) {
- DIEValue DWONameAttrInfo = UnitDIE.findAttribute(dwarf::DW_AT_dwo_name);
- if (!DWONameAttrInfo)
- DWONameAttrInfo = UnitDIE.findAttribute(dwarf::DW_AT_GNU_dwo_name);
- assert(DWONameAttrInfo && "DW_AT_dwo_name is not in Skeleton CU.");
- std::string ObjectName;
-
- ObjectName = getDWOName(Unit, NameToIndexMap);
- addStringHelper(StrOffstsWriter, StrWriter, DIEBldr, UnitDIE, Unit,
- DWONameAttrInfo, ObjectName.c_str());
-
- DIEValue CompDirAttrInfo = UnitDIE.findAttribute(dwarf::DW_AT_comp_dir);
- assert(CompDirAttrInfo && "DW_AT_comp_dir is not in Skeleton CU.");
-
- if (!opts::DwarfOutputPath.empty()) {
- if (!sys::fs::exists(opts::DwarfOutputPath))
- sys::fs::create_directory(opts::DwarfOutputPath);
- addStringHelper(StrOffstsWriter, StrWriter, DIEBldr, UnitDIE, Unit,
- CompDirAttrInfo, opts::DwarfOutputPath.c_str());
- }
- return ObjectName;
+ Rewriter.writeDWOFiles(CU, OverriddenSections, DWOName, LocWriter,
+ StrOffstsWriter, StrWriter);
}
using DWARFUnitVec = std::vector<DWARFUnit *>;
@@ -673,9 +605,8 @@ void DWARFRewriter::updateDebugInfo() {
return;
ARangesSectionWriter = std::make_unique<DebugARangesSectionWriter>();
- StrWriter = std::make_unique<DebugStrWriter>(BC);
-
- StrOffstsWriter = std::make_unique<DebugStrOffsetsWriter>();
+ StrWriter = std::make_unique<DebugStrWriter>(*BC.DwCtx, false);
+ StrOffstsWriter = std::make_unique<DebugStrOffsetsWriter>(BC);
if (!opts::DeterministicDebugInfo) {
opts::DeterministicDebugInfo = true;
@@ -720,10 +651,6 @@ void DWARFRewriter::updateDebugInfo() {
return LocListWritersByCU[CUIndex++].get();
};
- // Unordered maps to handle name collision if output DWO directory is
- // specified.
- std::unordered_map<std::string, uint32_t> NameToIndexMap;
-
DWARF5AcceleratorTable DebugNamesTable(opts::CreateDebugNames, BC,
*StrWriter);
DWPState State;
@@ -747,13 +674,20 @@ void DWARFRewriter::updateDebugInfo() {
Unit);
DWODIEBuilder.buildDWOUnit(**SplitCU);
std::string DWOName = "";
+ std::optional<std::string> DwarfOutputPath =
+ opts::DwarfOutputPath.empty()
+ ? std::nullopt
+ : std::optional<std::string>(opts::DwarfOutputPath.c_str());
{
std::lock_guard<std::mutex> Lock(AccessMutex);
- DWOName = updateDWONameCompDir(*StrOffstsWriter, *StrWriter,
- NameToIndexMap, *Unit, *DIEBlder,
- *DIEBlder->getUnitDIEbyUnit(*Unit));
+ DWOName = DIEBlder->updateDWONameCompDir(
+ *StrOffstsWriter, *StrWriter, *Unit, DwarfOutputPath, std::nullopt);
}
-
+ DebugStrOffsetsWriter DWOStrOffstsWriter(BC);
+ DebugStrWriter DWOStrWriter((*SplitCU)->getContext(), true);
+ DWODIEBuilder.updateDWONameCompDirForTypes(DWOStrOffstsWriter,
+ DWOStrWriter, **SplitCU,
+ DwarfOutputPath, DWOName);
DebugLoclistWriter DebugLocDWoWriter(*Unit, Unit->getVersion(), true);
DebugRangesSectionWriter *TempRangesSectionWriter = RangesSectionWriter;
if (Unit->getVersion() >= 5) {
@@ -771,7 +705,7 @@ void DWARFRewriter::updateDebugInfo() {
TempRangesSectionWriter->finalizeSection();
emitDWOBuilder(DWOName, DWODIEBuilder, *this, **SplitCU, *Unit, State,
- DebugLocDWoWriter);
+ DebugLocDWoWriter, DWOStrOffstsWriter, DWOStrWriter);
}
if (Unit->getVersion() >= 5) {
@@ -1736,6 +1670,7 @@ std::optional<StringRef> updateDebugData(
const DWARFUnitIndex::Entry *CUDWOEntry, uint64_t DWOId,
std::unique_ptr<DebugBufferVector> &OutputBuffer,
DebugRangeListsSectionWriter *RangeListsWriter, DebugLocWriter &LocWriter,
+ DebugStrOffsetsWriter &StrOffstsWriter, DebugStrWriter &StrWriter,
const llvm::bolt::DWARFRewriter::OverriddenSectionsMap &OverridenSections) {
using DWOSectionContribution =
@@ -1774,6 +1709,11 @@ std::optional<StringRef> updateDebugData(
if (!SectionName.equals("debug_str.dwo"))
errs() << "BOLT-WARNING: unsupported debug section: " << SectionName
<< "\n";
+ if (StrWriter.isInitialized()) {
+ OutputBuffer = StrWriter.releaseBuffer();
+ return StringRef(reinterpret_cast<const char *>(OutputBuffer->data()),
+ OutputBuffer->size());
+ }
return SectionContents;
}
case DWARFSectionKind::DW_SECT_INFO: {
@@ -1783,6 +1723,11 @@ std::optional<StringRef> updateDebugData(
return getOverridenSection(DWARFSectionKind::DW_SECT_EXT_TYPES);
}
case DWARFSectionKind::DW_SECT_STR_OFFSETS: {
+ if (StrOffstsWriter.isFinalized()) {
+ OutputBuffer = StrOffstsWriter.releaseBuffer();
+ return StringRef(reinterpret_cast<const char *>(OutputBuffer->data()),
+ OutputBuffer->size());
+ }
return getSliceData(CUDWOEntry, SectionContents,
DWARFSectionKind::DW_SECT_STR_OFFSETS, DWPOffset);
}
@@ -1884,7 +1829,9 @@ void DWARFRewriter::updateDWP(DWARFUnit &CU,
const OverriddenSectionsMap &OverridenSections,
const DWARFRewriter::UnitMeta &CUMI,
DWARFRewriter::UnitMetaVectorType &TUMetaVector,
- DWPState &State, DebugLocWriter &LocWriter) {
+ DWPState &State, DebugLocWriter &LocWriter,
+ DebugStrOffsetsWriter &StrOffstsWriter,
+ DebugStrWriter &StrWriter) {
const uint64_t DWOId = *CU.getDWOId();
MCSection *const StrOffsetSection = S...
[truncated]
|
dcci
requested changes
May 8, 2024
bolt/lib/Core/DIEBuilder.cpp
Outdated
| @@ -41,6 +42,92 @@ extern cl::opt<unsigned> Verbosity; | |||
| namespace llvm { | |||
| namespace bolt { | |||
|
|
|||
| /// Returns DWO Name to be used. Handles case where user specifies output DWO | |||
There was a problem hiding this comment.
to be used for what? Maybe you can reword this comment a bit.
dcci
approved these changes
May 13, 2024
maksfb
changed the title
maksfb
reviewed
May 14, 2024
| ; BOLT-PATH: DW_TAG_compile_unit | ||
| ; BOLT-PATH: .debug_str_offsets.dwo contents: | ||
| ; BOLT-PATH-NEXT: 0x00000000: Contribution size = 68, Format = DWARF32, Version = 5 | ||
| ; BOLT-PATH-NEXT: "main" |
There was a problem hiding this comment.
Do we have to check all strings or file names should be enough?
There was a problem hiding this comment.
I think testing all strings makes a more complete test. In case we corrupt others somehow.
maksfb
approved these changes
May 14, 2024
klensy
reviewed
May 15, 2024
| ; BOLT-NEXT: "c2" | ||
| ; BOLT-NEXT: "c3" | ||
| ; BOLT-NEXT: "Foo2a" | ||
| ; BOLT-NEXT: "clang version 18.0.0git (git@github.com:ayermolo/llvm-project.git db35fa8fc524127079662802c4735dbf397f86d0)" |
There was a problem hiding this comment.
hardcoded version should fail?
There was a problem hiding this comment.
No because input is assembly.
klensy
reviewed
May 15, 2024
| ; BOLT-NEXT: "char" | ||
| ; BOLT-NEXT: "c3" | ||
| ; BOLT-NEXT: "Foo2a" | ||
| ; BOLT-NEXT: "clang version 18.0.0" |
klensy
reviewed
May 15, 2024
| ; BOLT-DWP-NEXT: "c2" | ||
| ; BOLT-DWP-NEXT: "c3" | ||
| ; BOLT-DWP-NEXT: "Foo2a" | ||
| ; BOLT-DWP-NEXT: "clang version 18.0.0git (git@github.com:ayermolo/llvm-project.git db35fa8fc524127079662802c4735dbf397f86d0)" |
klensy
reviewed
May 15, 2024
| ; BOLT-DWP-NEXT: "char" | ||
| ; BOLT-DWP-NEXT: "c3" | ||
| ; BOLT-DWP-NEXT: "Foo2a" | ||
| ; BOLT-DWP-NEXT: "clang version 18.0.0" |
There was a problem hiding this comment.
and the same checks here and in other files.
klensy
reviewed
May 15, 2024
| ; BOLT-DWP: DW_TAG_compile_unit | ||
| ; BOLT-DWP: DW_AT_dwo_name ("main.dwo.dwo") | ||
| ; BOLT-DWP: DW_TAG_type_unit | ||
| ; BOLT-DW-NOT: DW_AT_dwo_name |
There was a problem hiding this comment.
; BOLT-DWP-NOT: DW_AT_dwo_name typo in filecheck annotation?
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Type unit DIE generated by clang contains DW_AT_comp_dir/DW_AT_dwo_name. This was added to clang to help LLDB to figure out where type unit come from when accessing an entry in a .debug_names accelerator table and type units in .dwp file.
When BOLT writes out .dwo files it changes the name of them. User can also specify directory of where they can be written out. Added support to BOLT to update those attributes.