[lld] f359c1f - [ELF] Disable error handling script if disableOutput
Fangrui Song via llvm-commits
llvm-commits at lists.llvm.org
Sat Jan 25 18:02:39 PST 2025
Author: Fangrui Song
Date: 2025-01-25T18:01:52-08:00
New Revision: f359c1f524bf826eba355b8863a870450eb747b0
URL: https://github.com/llvm/llvm-project/commit/f359c1f524bf826eba355b8863a870450eb747b0
DIFF: https://github.com/llvm/llvm-project/commit/f359c1f524bf826eba355b8863a870450eb747b0.diff
LOG: [ELF] Disable error handling script if disableOutput
Fix ELF/error-handling-script-linux.test when LLD_IN_TEST=2 is set.
Added:
Modified:
lld/Common/ErrorHandler.cpp
Removed:
################################################################################
diff --git a/lld/Common/ErrorHandler.cpp b/lld/Common/ErrorHandler.cpp
index 716bce54258ce7..a11960325a9cda 100644
--- a/lld/Common/ErrorHandler.cpp
+++ b/lld/Common/ErrorHandler.cpp
@@ -289,7 +289,7 @@ void ErrorHandler::error(const Twine &msg) {
void ErrorHandler::error(const Twine &msg, ErrorTag tag,
ArrayRef<StringRef> args) {
- if (errorHandlingScript.empty()) {
+ if (errorHandlingScript.empty() || disableOutput) {
error(msg);
return;
}
More information about the llvm-commits
mailing list