Skip to content

Cherry-pick PR #7912 into stable/20230725 #7937

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jan 5, 2024
Merged

Cherry-pick PR #7912 into stable/20230725 #7937

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions llvm/lib/MCCAS/MCCASObjectV1.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3113,6 +3113,7 @@ struct DIEVisitor {
ArrayRef<AbbrevContent> DIEContents);
Error materializeAbbrevDIE(unsigned AbbrevIdx);

uint16_t DwarfVersion;
SmallVector<AbbrevEntry> AbbrevEntryCache;
ArrayRef<StringRef> AbbrevEntries;
BinaryStreamReader DistinctReader;
Expand All @@ -3131,8 +3132,8 @@ Error DIEVisitor::visitDIEAttrs(BinaryStreamReader &DataReader,
ArrayRef<AbbrevContent> DIEContents) {
constexpr auto IsLittleEndian = true;
constexpr auto AddrSize = 8;
constexpr auto FormParams =
dwarf::FormParams{4 /*Version*/, AddrSize, dwarf::DwarfFormat::DWARF32};
auto FormParams =
dwarf::FormParams{DwarfVersion, AddrSize, dwarf::DwarfFormat::DWARF32};

for (auto Contents : DIEContents) {
bool DataInDistinct = Contents.FormInDistinctData;
Expand Down Expand Up @@ -3242,8 +3243,8 @@ static std::optional<uint8_t> getNonULEBFormSize(dwarf::Form Form,

Error DIEVisitor::materializeAbbrevDIE(unsigned AbbrevIdx) {
constexpr auto AddrSize = 8;
constexpr auto FormParams =
dwarf::FormParams{4 /*Version*/, AddrSize, dwarf::DwarfFormat::DWARF32};
auto FormParams =
dwarf::FormParams{DwarfVersion, AddrSize, dwarf::DwarfFormat::DWARF32};

AbbrevEntryReader AbbrevReader =
getAbbrevEntryReader(AbbrevEntries, AbbrevIdx);
Expand Down Expand Up @@ -3422,7 +3423,8 @@ Error mccasformats::v1::visitDebugInfo(
HeaderCallback(toStringRef(HeaderData));

append_range(TotAbbrevEntries, LoadedTopRef->AbbrevEntries);
DIEVisitor Visitor{{},
DIEVisitor Visitor{DwarfVersion,
{},
TotAbbrevEntries,
DistinctReader,
UncompressedDistinctData,
Expand Down