squiid/llvm
1
0
Fork 0
Code Issues Pull requests Activity

[mlir] Fix tsan failure in PassCrashRecovery

Browse source 
Don't set printOpOnDiagnostic, as this is not safe to call from a threaded context.

Differential Revision: https://reviews.llvm.org/D111752
This commit is contained in:
River Riddle 2021-10-18 15:17:40 +00:00
parent 7e5dbcdd59
commit 20211b3261
1 changed files with 2 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
mlir/lib/Pass/PassCrashRecovery.cpp
View file

@ -153,8 +153,7 @@ void RecoveryReproducerContext::crashHandler(void *) {
context->generate(description);
// Emit an error using information only available within the context.
context->preCrashOperation->getContext()->printOpOnDiagnostic(false);
context->preCrashOperation->emitError()
emitError(context->preCrashOperation->getLoc())
<< "A failure has been detected while processing the MLIR module:"
<< description;
}
@ -235,13 +234,9 @@ void PassCrashReproducerGenerator::finalize(Operation *rootOp,
if (succeeded(executionResult))
return impl->activeContexts.clear();
MLIRContext *context = rootOp->getContext();
bool shouldPrintOnOp = context->shouldPrintOpOnDiagnostic();
context->printOpOnDiagnostic(false);
InFlightDiagnostic diag = rootOp->emitError()
InFlightDiagnostic diag = emitError(rootOp->getLoc())
<< "Failures have been detected while "
"processing an MLIR pass pipeline";
context->printOpOnDiagnostic(shouldPrintOnOp);
// If we are generating a global reproducer, we include all of the running
// passes in the error message for the only active context.