Skip to content

[profdata] Consume reader error if returned early #163671

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 2 commits into
base: main
Choose a base branch
from
Open

[profdata] Consume reader error if returned early #163671

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8d6f05
[profdata] Consume reader error if returned early
ellishg Oct 16, 2025
68fa9c4
add comment
ellishg Oct 16, 2025
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
7 changes: 7 additions & 0 deletions llvm/tools/llvm-profdata/llvm-profdata.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@
//
//===----------------------------------------------------------------------===//

#include "llvm/ADT/ScopeExit.h"
#include "llvm/ADT/SmallSet.h"
#include "llvm/ADT/SmallVector.h"
#include "llvm/ADT/StringRef.h"
Expand Down Expand Up @@ -778,6 +779,12 @@ loadInput(const WeightedFile &Input, SymbolRemapper *Remapper,
// we have more non-fatal errors from InstrProfReader in the future. How
// should this interact with different -failure-mode?
std::optional<std::pair<Error, std::string>> ReaderWarning;
auto ReaderWarningScope = llvm::make_scope_exit([&] {
// If we hit a different error we may still have an error in ReaderWarning.
// Consume it now to avoid an assert
if (ReaderWarning)
consumeError(std::move(ReaderWarning->first));
});
auto Warn = [&](Error E) {
if (ReaderWarning) {
consumeError(std::move(E));
Expand Down