Author: Daniel Thornburgh Date: 2025-06-17T15:50:32-07:00 New Revision: 93b062772fa316407d77eb2f71fb622568bbd669
URL: https://github.com/llvm/llvm-project/commit/93b062772fa316407d77eb2f71fb622568bbd669 DIFF: https://github.com/llvm/llvm-project/commit/93b062772fa316407d77eb2f71fb622568bbd669.diff LOG: Revert "[libc++] Remove trailing newline from _LIBCPP_ASSERTION_HANDLER calls…" This reverts commit a5a0d880736f5dc6a566374bc3b3ca0d86901510. Added: Modified: libcxx/include/__assert libcxx/src/verbose_abort.cpp libcxx/test/support/check_assertion.h Removed: ################################################################################ diff --git a/libcxx/include/__assert b/libcxx/include/__assert index 1bfed2890b79f..90eaa6023587b 100644 --- a/libcxx/include/__assert +++ b/libcxx/include/__assert @@ -20,8 +20,8 @@ #define _LIBCPP_ASSERT(expression, message) \ (__builtin_expect(static_cast<bool>(expression), 1) \ ? (void)0 \ - : _LIBCPP_ASSERTION_HANDLER( \ - __FILE__ ":" _LIBCPP_TOSTRING(__LINE__) ": assertion " _LIBCPP_TOSTRING(expression) " failed: " message)) + : _LIBCPP_ASSERTION_HANDLER(__FILE__ ":" _LIBCPP_TOSTRING(__LINE__) ": assertion " _LIBCPP_TOSTRING( \ + expression) " failed: " message "\n")) // WARNING: __builtin_assume can currently inhibit optimizations. Only add assumptions with a clear // optimization intent. See https://discourse.llvm.org/t/llvm-assume-blocks-optimization/71609 for a diff --git a/libcxx/src/verbose_abort.cpp b/libcxx/src/verbose_abort.cpp index efb7b9be6f61c..94bdb451dee7a 100644 --- a/libcxx/src/verbose_abort.cpp +++ b/libcxx/src/verbose_abort.cpp @@ -30,9 +30,6 @@ _LIBCPP_WEAK void __libcpp_verbose_abort(char const* format, ...) noexcept { va_list list; va_start(list, format); std::vfprintf(stderr, format, list); - // Callers of `__libcpp_verbose_abort` do not include a newline but when - // writing the message to stderr we need to include one. - std::fputc('\n', stderr); va_end(list); } diff --git a/libcxx/test/support/check_assertion.h b/libcxx/test/support/check_assertion.h index ea04944ea9326..a279400d651b4 100644 --- a/libcxx/test/support/check_assertion.h +++ b/libcxx/test/support/check_assertion.h @@ -340,7 +340,7 @@ void std::__libcpp_verbose_abort(char const* format, ...) noexcept { std::fprintf(stderr, "%s\n", Marker); std::vfprintf(stderr, format, args); - std::fprintf(stderr, "\n%s", Marker); + std::fprintf(stderr, "%s", Marker); va_end(args); _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
