Skip to content

[llvm-cov] Keep the detailed error message in CoverageMappingIterator #80415

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

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[llvm-cov] Keep the detailed error message in CoverageMappingIterator #80415

Show file tree
Hide file tree
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
5 changes: 3 additions & 2 deletions llvm/include/llvm/ProfileData/Coverage/CoverageMappingReader.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ class CoverageMappingIterator {
CoverageMappingReader *Reader;
CoverageMappingRecord Record;
coveragemap_error ReadErr;
std::string ReadErrMsg;

void increment();

Expand Down Expand Up @@ -80,15 +81,15 @@ class CoverageMappingIterator {
}
Expected<CoverageMappingRecord &> operator*() {
if (ReadErr != coveragemap_error::success) {
auto E = make_error<CoverageMapError>(ReadErr);
auto E = make_error<CoverageMapError>(ReadErr, ReadErrMsg);
ReadErr = coveragemap_error::success;
return std::move(E);
}
return Record;
}
Expected<CoverageMappingRecord *> operator->() {
if (ReadErr != coveragemap_error::success) {
auto E = make_error<CoverageMapError>(ReadErr);
auto E = make_error<CoverageMapError>(ReadErr, ReadErrMsg);
ReadErr = coveragemap_error::success;
return std::move(E);
}
Expand Down
4 changes: 3 additions & 1 deletion llvm/lib/ProfileData/Coverage/CoverageMappingReader.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,8 +57,10 @@ void CoverageMappingIterator::increment() {
handleAllErrors(std::move(E), [&](const CoverageMapError &CME) {
if (CME.get() == coveragemap_error::eof)
*this = CoverageMappingIterator();
else
else {
ReadErr = CME.get();
ReadErrMsg = CME.getMessage();
}
});
}

Expand Down
2 changes: 1 addition & 1 deletion llvm/test/tools/llvm-cov/warnings.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
// FAKE-FUNC-STDERR: Could not read coverage for '{{.*}}'.

// RUN: not llvm-cov report %S/Inputs/malformedRegions.covmapping -instr-profile %S/Inputs/elf_binary_comdat.profdata 2>&1 | FileCheck %s -check-prefix=MALFORMED-REGION
// MALFORMED-REGION: failed to load coverage: '{{.*}}malformedRegions.covmapping': malformed coverage data
// MALFORMED-REGION: failed to load coverage: '{{.*}}malformedRegions.covmapping': malformed coverage data: counter mapping region locations are incorrect