diff options
author | Vedant Kumar <vsk@apple.com> | 2017-11-17 21:18:32 +0000 |
---|---|---|
committer | Vedant Kumar <vsk@apple.com> | 2017-11-17 21:18:32 +0000 |
commit | ddb44a6e699484c705d1999538e23e46fb58dcd2 (patch) | |
tree | 2cbbbcdcc25cde4becff616bc36dab14e74b7953 /tools | |
parent | 4f5d63bce059e77b1b3cc69e8941b40f9db7b0ae (diff) |
[llvm-profdata] Don't treat non-fatal merge errors as fatal
This fixes an issue seen on the coverage bot:
http://lab.llvm.org:8080/green/view/Experimental/job/clang-stage2-coverage-R/1930
Profile merging shouldn't fail if a single counter mismatch is detected.
git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@318555 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'tools')
-rw-r--r-- | tools/llvm-profdata/llvm-profdata.cpp | 50 |
1 files changed, 43 insertions, 7 deletions
diff --git a/tools/llvm-profdata/llvm-profdata.cpp b/tools/llvm-profdata/llvm-profdata.cpp index f5aa7062e62..9afd0ae92ea 100644 --- a/tools/llvm-profdata/llvm-profdata.cpp +++ b/tools/llvm-profdata/llvm-profdata.cpp @@ -37,14 +37,19 @@ using namespace llvm; enum ProfileFormat { PF_None = 0, PF_Text, PF_Binary, PF_GCC }; -static void exitWithError(Twine Message, std::string Whence = "", - std::string Hint = "") { - errs() << "error: "; +static void warn(StringRef Prefix, Twine Message, std::string Whence = "", + std::string Hint = "") { + errs() << Prefix; if (!Whence.empty()) errs() << Whence << ": "; errs() << Message << "\n"; if (!Hint.empty()) errs() << Hint << "\n"; +} + +static void exitWithError(Twine Message, std::string Whence = "", + std::string Hint = "") { + warn("error: ", Message, Whence, Hint); ::exit(1); } @@ -129,6 +134,22 @@ struct WriterContext { ErrLock(ErrLock), WriterErrorCodes(WriterErrorCodes) {} }; +/// Determine whether an error is fatal for profile merging. +static bool isFatalError(instrprof_error IPE) { + switch (IPE) { + default: + return true; + case instrprof_error::success: + case instrprof_error::eof: + case instrprof_error::unknown_function: + case instrprof_error::hash_mismatch: + case instrprof_error::count_mismatch: + case instrprof_error::counter_overflow: + case instrprof_error::value_site_count_mismatch: + return false; + } +} + /// Load an input into a writer context. static void loadInput(const WeightedFile &Input, WriterContext *WC) { std::unique_lock<std::mutex> CtxGuard{WC->Lock}; @@ -177,8 +198,13 @@ static void loadInput(const WeightedFile &Input, WriterContext *WC) { FuncName, firstTime); }); } - if (Reader->hasError()) - WC->Err = Reader->getError(); + if (Reader->hasError()) { + if (Error E = Reader->getError()) { + instrprof_error IPE = InstrProfError::take(std::move(E)); + if (isFatalError(IPE)) + WC->Err = make_error<InstrProfError>(IPE); + } + } } /// Merge the \p Src writer context into \p Dst. @@ -262,10 +288,20 @@ static void mergeInstrProfile(const WeightedFileVector &Inputs, } // Handle deferred hard errors encountered during merging. - for (std::unique_ptr<WriterContext> &WC : Contexts) - if (WC->Err) + for (std::unique_ptr<WriterContext> &WC : Contexts) { + if (!WC->Err) + continue; + if (!WC->Err.isA<InstrProfError>()) exitWithError(std::move(WC->Err), WC->ErrWhence); + instrprof_error IPE = InstrProfError::take(std::move(WC->Err)); + if (isFatalError(IPE)) + exitWithError(make_error<InstrProfError>(IPE), WC->ErrWhence); + else + warn("warning: ", toString(make_error<InstrProfError>(IPE)), + WC->ErrWhence); + } + InstrProfWriter &Writer = Contexts[0]->Writer; if (OutputFormat == PF_Text) { if (Error E = Writer.writeText(Output)) |