Skip to content

Make FormParams have the correct DWARF version. #7912

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.

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 3, 2024

Conversation

rastogishubham
Copy link

@rastogishubham rastogishubham commented Dec 20, 2023

This PR addresses this comment #7852 (comment)

@rastogishubham
Copy link
Author

@swift-ci please test llvm

@rastogishubham
Copy link
Author

@swift-ci please test

@@ -3143,8 +3144,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 /*Version*/, AddrSize,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I guess we don't need the inline comment anymore :)

@@ -3254,8 +3255,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 /*Version*/, AddrSize,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

same here!

@rastogishubham rastogishubham merged commit 5cf3116 into swiftlang:next Jan 3, 2024
@rastogishubham
Copy link
Author

@swift-ci please test llvm

rastogishubham added a commit that referenced this pull request Jan 5, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants