[llvm] 4fed39d - [ThinLTO] Fix nondeterministic exit on error.
Mircea Trofin via llvm-commits
llvm-commits at lists.llvm.org
Mon Dec 13 10:09:04 PST 2021
Author: Mircea Trofin
Date: 2021-12-13T10:08:39-08:00
New Revision: 4fed39ddee4dbc23df7317a3fe311a56a9e423b5
URL: https://github.com/llvm/llvm-project/commit/4fed39ddee4dbc23df7317a3fe311a56a9e423b5
DIFF: https://github.com/llvm/llvm-project/commit/4fed39ddee4dbc23df7317a3fe311a56a9e423b5.diff
LOG: [ThinLTO] Fix nondeterministic exit on error.
In the multi-threaded case, if a thread hits an error, we mimick
LLVMContext's behavior of reporting the error and exit-ing. However,
this doesn't cleanly join the other threads, so depending on how fast
the process exits, other threads may report 'terminate called without an
active exception'.
To avoid this non-determinsim, and without introducing a more complicated
design, we just report the error, but not exit early. We do track whether
we hit errors and exit(1) after joining.
Differential Revision: https://reviews.llvm.org/D115574
Added:
Modified:
llvm/tools/llvm-lto2/llvm-lto2.cpp
Removed:
################################################################################
diff --git a/llvm/tools/llvm-lto2/llvm-lto2.cpp b/llvm/tools/llvm-lto2/llvm-lto2.cpp
index 6f6f6c1ed90fd..6830bd8f1b2c5 100644
--- a/llvm/tools/llvm-lto2/llvm-lto2.cpp
+++ b/llvm/tools/llvm-lto2/llvm-lto2.cpp
@@ -29,6 +29,7 @@
#include "llvm/Support/PluginLoader.h"
#include "llvm/Support/TargetSelect.h"
#include "llvm/Support/Threading.h"
+#include <atomic>
using namespace llvm;
using namespace lto;
@@ -236,13 +237,6 @@ static int run(int argc, char **argv) {
std::vector<std::unique_ptr<MemoryBuffer>> MBs;
Config Conf;
- Conf.DiagHandler = [](const DiagnosticInfo &DI) {
- DiagnosticPrinterRawOStream DP(errs());
- DI.print(DP);
- errs() << '\n';
- if (DI.getSeverity() == DS_Error)
- exit(1);
- };
Conf.CPU = codegen::getMCPU();
Conf.Options = codegen::InitTargetOptionsFromCodeGenFlags(Triple());
@@ -314,9 +308,25 @@ static int run(int argc, char **argv) {
else
Backend = createInProcessThinBackend(
llvm::heavyweight_hardware_concurrency(Threads));
+ // Track whether we hit an error; in particular, in the multi-threaded case,
+ // we can't exit() early because the rest of the threads wouldn't have had a
+ // change to be join-ed, and that would result in a "terminate called without
+ // an active exception". Altogether, this results in nondeterministic
+ // behavior. Instead, we don't exit in the multi-threaded case, but we make
+ // sure to report the error and then at the end (after joining cleanly)
+ // exit(1).
+ std::atomic<bool> HasErrors;
+ std::atomic_init(&HasErrors, false);
+ Conf.DiagHandler = [&](const DiagnosticInfo &DI) {
+ DiagnosticPrinterRawOStream DP(errs());
+ DI.print(DP);
+ errs() << '\n';
+ if (DI.getSeverity() == DS_Error)
+ HasErrors = true;
+ };
+
LTO Lto(std::move(Conf), std::move(Backend));
- bool HasErrors = false;
for (std::string F : InputFilenames) {
std::unique_ptr<MemoryBuffer> MB = check(MemoryBuffer::getFile(F), F);
std::unique_ptr<InputFile> Input =
@@ -381,7 +391,7 @@ static int run(int argc, char **argv) {
"failed to create cache");
check(Lto.run(AddStream, Cache), "LTO::run failed");
- return 0;
+ return static_cast<int>(HasErrors);
}
static int dumpSymtab(int argc, char **argv) {
More information about the llvm-commits
mailing list