[DWARF] Refactor findDebugNamesOffsets #88064
Merged
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
Created using spr 1.3.5-bogner
|
@llvm/pr-subscribers-debuginfo Author: Fangrui Song (MaskRay) ChangesAddress some post-review comments in #82153 and move the function inside Full diff: https://github.com/llvm/llvm-project/pull/88064.diff 2 Files Affected:
diff --git a/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h b/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
index f1d4fc72d5a727..9543b78ea61309 100644
--- a/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
+++ b/llvm/include/llvm/DebugInfo/DWARF/DWARFAcceleratorTable.h
@@ -804,9 +804,11 @@ class DWARFDebugNames : public DWARFAcceleratorTable {
/// Calculates the starting offsets for various sections within the
/// .debug_names section.
-void findDebugNamesOffsets(DWARFDebugNames::DWARFDebugNamesOffsets &Offsets,
- uint64_t HdrSize, const dwarf::DwarfFormat Format,
- const DWARFDebugNames::Header &Hdr);
+namespace dwarf {
+DWARFDebugNames::DWARFDebugNamesOffsets
+findDebugNamesOffsets(uint64_t EndOfHeaderOffset,
+ const DWARFDebugNames::Header &Hdr);
+}
/// If `Name` is the name of a templated function that includes template
/// parameters, returns a substring of `Name` containing no template
diff --git a/llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp b/llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp
index 9c65d85985f1bb..3a84784ff967f0 100644
--- a/llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp
+++ b/llvm/lib/DebugInfo/DWARF/DWARFAcceleratorTable.cpp
@@ -552,11 +552,12 @@ DWARFDebugNames::NameIndex::extractAbbrev(uint64_t *Offset) {
return Abbrev(Code, dwarf::Tag(Tag), AbbrevOffset, std::move(*AttrEncOr));
}
-void llvm::findDebugNamesOffsets(
- DWARFDebugNames::DWARFDebugNamesOffsets &Offsets, uint64_t HdrSize,
- dwarf::DwarfFormat Format, const DWARFDebugNames::Header &Hdr) {
- uint32_t DwarfSize = (Format == llvm::dwarf::DwarfFormat::DWARF64) ? 8 : 4;
- uint64_t Offset = HdrSize;
+DWARFDebugNames::DWARFDebugNamesOffsets
+dwarf::findDebugNamesOffsets(uint64_t EndOfHeaderOffset,
+ const DWARFDebugNames::Header &Hdr) {
+ DWARFDebugNames::DWARFDebugNamesOffsets Offsets;
+ uint32_t DwarfSize = Hdr.Format == dwarf::DwarfFormat::DWARF64 ? 8 : 4;
+ uint64_t Offset = EndOfHeaderOffset;
Offsets.CUsBase = Offset;
Offset += Hdr.CompUnitCount * DwarfSize;
Offset += Hdr.LocalTypeUnitCount * DwarfSize;
@@ -577,6 +578,7 @@ void llvm::findDebugNamesOffsets(
Offset += Hdr.AbbrevTableSize;
Offsets.EntriesBase = Offset;
+ return Offsets;
}
Error DWARFDebugNames::NameIndex::extract() {
@@ -586,7 +588,7 @@ Error DWARFDebugNames::NameIndex::extract() {
return E;
const unsigned SectionOffsetSize = dwarf::getDwarfOffsetByteSize(Hdr.Format);
- findDebugNamesOffsets(Offsets, hdrSize, Hdr.Format, Hdr);
+ Offsets = dwarf::findDebugNamesOffsets(hdrSize, Hdr);
uint64_t Offset =
Offsets.EntryOffsetsBase + (Hdr.NameCount * SectionOffsetSize);
|
MaskRay
requested review from
cmtice,
felipepiovezan,
adrian-prantl and
dwblaikie
felipepiovezan
approved these changes
Apr 8, 2024
Created using spr 1.3.5-bogner
cmtice
reviewed
Apr 9, 2024
| dwarf::findDebugNamesOffsets(uint64_t EndOfHeaderOffset, | ||
| const DWARFDebugNames::Header &Hdr) { | ||
| DWARFDebugNames::DWARFDebugNamesOffsets Ret; | ||
| uint32_t DwarfSize = Hdr.Format == dwarf::DwarfFormat::DWARF64 ? 8 : 4; |
There was a problem hiding this comment.
In a post-review comment in PR 82153, David suggested using dwarf::gerDwarfOffsetByteSize for the DwarfSize.
There was a problem hiding this comment.
Thanks. Adopted gerDwarfOffsetByteSize
Created using spr 1.3.5-bogner
cmtice
approved these changes
Apr 9, 2024
MaskRay
deleted the
users/MaskRay/spr/dwarf-refactor-finddebugnamesoffsets
branch
MaskRay
added a commit
to MaskRay/llvm-project
that referenced
this pull request
Apr 15, 2024
The parameter of `findDebugNamesOffsets` has been renamed to `EndOfHeaderOffset` in llvm#88064 to make it clear it is a section offset instead of an offset relative to the current name index. Rename the call site variable as well.
MaskRay
added a commit
that referenced
this pull request
Apr 16, 2024
The parameter of `findDebugNamesOffsets` has been renamed to `EndOfHeaderOffset` in #88064 to make it clear it is a section offset instead of an offset relative to the current name index. Rename the call site variable as well.
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.
Address some post-review comments in #82153 and move the function inside
llvm::dwarf, used by certain free functions.