From ead7a5fc04360c1d740214048b15c4d7100dc768 Mon Sep 17 00:00:00 2001 From: Louis Dionne Date: Mon, 9 May 2022 13:31:42 -0400 Subject: [PATCH] [libc++abi] Reword uncaught exception termination message When we terminate due to an exception being uncaught, libc++abi prints a message saying "terminating with uncaught exception [...]". This patch changes that to say "terminating due to uncaught exception [...]" instead, which is a bit clearer. Indeed, I've seen some people being confused and thinking that libc++abi was the component throwing the exception. Differential Revision: https://reviews.llvm.org/D125245 --- libcxxabi/src/cxa_default_handlers.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/libcxxabi/src/cxa_default_handlers.cpp b/libcxxabi/src/cxa_default_handlers.cpp index b6ce058..2c42f65 100644 --- a/libcxxabi/src/cxa_default_handlers.cpp +++ b/libcxxabi/src/cxa_default_handlers.cpp @@ -63,17 +63,17 @@ static void demangling_terminate_handler() { // Include the what() message from the exception const std::exception* e = static_cast(thrown_object); - abort_message("terminating with %s exception of type %s: %s", + abort_message("terminating due to %s exception of type %s: %s", cause, name, e->what()); } else - // Else just note that we're terminating with an exception - abort_message("terminating with %s exception of type %s", + // Else just note that we're terminating due to an exception + abort_message("terminating due to %s exception of type %s", cause, name); } else - // Else we're terminating with a foreign exception - abort_message("terminating with %s foreign exception", cause); + // Else we're terminating due to a foreign exception + abort_message("terminating due to %s foreign exception", cause); } } #endif -- 2.7.4