Skip to content
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

Aggregate errors from llvm-dwarfdump --verify #79648

Merged
merged 13 commits into from
Feb 1, 2024
Merged

Aggregate errors from llvm-dwarfdump --verify #79648

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
3733d88
Not formatted, mostly to keep the current model easy to see
Jan 24, 2024
2d717a7
Added usage comments
Jan 24, 2024
01c5227
Finished first pass over the error()'s (inserted some TODO's)
Jan 25, 2024
b33a3c6
Updated with Greg's suggestion for the reporter
Jan 25, 2024
2bd08dc
Cleaned up: Non-verbose output is downright succinct!
Jan 25, 2024
a6613ac
Set up the flags in a reasonable way
Jan 25, 2024
c171a95
A few final touches before tests
Jan 25, 2024
e3176b4
Adding flags to make output the same as before for tests
Jan 26, 2024
064bef5
A couple minor tweaks to keep the previous behavior 'available'
Jan 26, 2024
c09abdc
Added checking for aggregate counts for a dwarfdump test
Jan 26, 2024
5a7d23e
Added a warning for the new flags
Jan 26, 2024
5269710
First chunk of PR feedback addressed
Jan 29, 2024
617670b
Response to PR feedback #2
Jan 30, 2024
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
1 change: 1 addition & 0 deletions llvm/include/llvm/DebugInfo/DIContext.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -205,6 +205,7 @@ struct DIDumpOptions {
bool DisplayRawContents = false;
bool IsEH = false;
bool DumpNonSkeleton = false;
bool ShowAggregateErrors = false;
std::function<llvm::StringRef(uint64_t DwarfRegNum, bool IsEH)>
GetNameForDWARFReg;

Expand Down
18 changes: 18 additions & 0 deletions llvm/include/llvm/DebugInfo/DWARF/DWARFVerifier.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,20 @@ class DWARFDebugAbbrev;
class DataExtractor;
struct DWARFSection;

class OutputCategoryAggregator {
private:
std::map<std::string, unsigned> Aggregation;
Copy link
Collaborator

Choose a reason for hiding this comment

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

llvm::StringMap?

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I reran tests with this change and then remembered why I went with std::map. It's sorted. llvm::StringMap isn't (hash-based). Add a single new category to the report and everything (might) get shuffled around, so I'd prefer to keep it a std::map.

bool IncludeDetail;

public:
OutputCategoryAggregator(bool includeDetail = false)
: IncludeDetail(includeDetail) {}
void ShowDetail(bool showDetail) { IncludeDetail = showDetail; }
size_t GetNumCategories() const { return Aggregation.size(); }
void Report(StringRef s, std::function<void()> detailCallback);
void EnumerateResults(std::function<void(StringRef, unsigned)> handleCounts);
};

/// A class that verifies DWARF debug information given a DWARF Context.
class DWARFVerifier {
public:
Expand Down Expand Up @@ -81,6 +95,7 @@ class DWARFVerifier {
DWARFContext &DCtx;
DIDumpOptions DumpOpts;
uint32_t NumDebugLineErrors = 0;
OutputCategoryAggregator ErrorCategory;
// Used to relax some checks that do not currently work portably
bool IsObjectFile;
bool IsMachOObject;
Expand Down Expand Up @@ -348,6 +363,9 @@ class DWARFVerifier {
bool verifyDebugStrOffsets(
StringRef SectionName, const DWARFSection &Section, StringRef StrData,
void (DWARFObject::*)(function_ref<void(const DWARFSection &)>) const);

/// Emits any aggregate information collected, depending on the dump options
void summarize();
};

static inline bool operator<(const DWARFVerifier::DieRangeInfo &LHS,
Expand Down
1 change: 1 addition & 0 deletions llvm/lib/DebugInfo/DWARF/DWARFContext.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1408,6 +1408,7 @@ bool DWARFContext::verify(raw_ostream &OS, DIDumpOptions DumpOpts) {
if (DumpOpts.DumpType & DIDT_DebugStrOffsets)
Success &= verifier.handleDebugStrOffsets();
Success &= verifier.handleAccelTables();
verifier.summarize();
return Success;
}

Expand Down
Loading
Loading