[libc++abi] Rename abort_message to __abort_message (#111413)

petrhosek · web-flow · commit e0737174f944 · 2024-10-09T15:18:53.000-04:00
This is an internal API and the name should reflect that. This is a reland of #108887.
diff --git a/libcxxabi/src/abort_message.cpp b/libcxxabi/src/abort_message.cpp
@@ -26,7 +26,7 @@
 #   define _LIBCXXABI_USE_CRASHREPORTER_CLIENT
 #endif
 
-void abort_message(const char* format, ...)
+void __abort_message(const char* format, ...)
 {
     // Write message to stderr. We do this before formatting into a
     // variable-size buffer so that we still get some information if
diff --git a/libcxxabi/src/abort_message.h b/libcxxabi/src/abort_message.h
@@ -12,14 +12,14 @@
 #include "cxxabi.h"
 
 extern "C" _LIBCXXABI_HIDDEN _LIBCXXABI_NORETURN void
-abort_message(const char *format, ...) __attribute__((format(printf, 1, 2)));
+__abort_message(const char *format, ...) __attribute__((format(printf, 1, 2)));
 
 #ifndef _LIBCXXABI_ASSERT
 #  define _LIBCXXABI_ASSERT(expr, msg)                                                                                 \
     do {                                                                                                               \
       if (!(expr)) {                                                                                                   \
         char const* __msg = (msg);                                                                                     \
-        ::abort_message("%s:%d: %s", __FILE__, __LINE__, __msg);                                                       \
+        ::__abort_message("%s:%d: %s", __FILE__, __LINE__, __msg);                                                     \
       }                                                                                                                \
     } while (false)
 
diff --git a/libcxxabi/src/cxa_default_handlers.cpp b/libcxxabi/src/cxa_default_handlers.cpp
@@ -30,18 +30,18 @@ static void demangling_terminate_handler()
 
     // If there is no uncaught exception, just note that we're terminating
     if (!globals)
-        abort_message("terminating");
+        __abort_message("terminating");
 
     __cxa_exception* exception_header = globals->caughtExceptions;
     if (!exception_header)
-        abort_message("terminating");
+        __abort_message("terminating");
 
     _Unwind_Exception* unwind_exception =
         reinterpret_cast<_Unwind_Exception*>(exception_header + 1) - 1;
 
     // If we're terminating due to a foreign exception
     if (!__isOurExceptionClass(unwind_exception))
-        abort_message("terminating due to %s foreign exception", cause);
+        __abort_message("terminating due to %s foreign exception", cause);
 
     void* thrown_object =
         __getExceptionClass(unwind_exception) == kOurDependentExceptionClass ?
@@ -67,19 +67,19 @@ static void demangling_terminate_handler()
     {
         // Include the what() message from the exception
         const std::exception* e = static_cast<const std::exception*>(thrown_object);
-        abort_message("terminating due to %s exception of type %s: %s", cause, name, e->what());
+        __abort_message("terminating due to %s exception of type %s: %s", cause, name, e->what());
     }
     else
     {
         // Else just note that we're terminating due to an exception
-        abort_message("terminating due to %s exception of type %s", cause, name);
+        __abort_message("terminating due to %s exception of type %s", cause, name);
     }
 }
 #else // !_LIBCXXABI_NO_EXCEPTIONS
 __attribute__((noreturn))
 static void demangling_terminate_handler()
 {
-    abort_message("terminating");
+    __abort_message("terminating");
 }
 #endif // !_LIBCXXABI_NO_EXCEPTIONS
 
diff --git a/libcxxabi/src/cxa_exception_storage.cpp b/libcxxabi/src/cxa_exception_storage.cpp
@@ -61,12 +61,12 @@ namespace {
     void _LIBCPP_TLS_DESTRUCTOR_CC destruct_(void *p) {
         __free_with_fallback(p);
         if (0 != std::__libcpp_tls_set(key_, NULL))
-            abort_message("cannot zero out thread value for __cxa_get_globals()");
+            __abort_message("cannot zero out thread value for __cxa_get_globals()");
     }
 
     void construct_() {
         if (0 != std::__libcpp_tls_create(&key_, destruct_))
-            abort_message("cannot create thread specific key for __cxa_get_globals()");
+            __abort_message("cannot create thread specific key for __cxa_get_globals()");
     }
 } // namespace
 
@@ -80,9 +80,9 @@ extern "C" {
             retVal = static_cast<__cxa_eh_globals*>(
                 __calloc_with_fallback(1, sizeof(__cxa_eh_globals)));
             if (NULL == retVal)
-                abort_message("cannot allocate __cxa_eh_globals");
+                __abort_message("cannot allocate __cxa_eh_globals");
             if (0 != std::__libcpp_tls_set(key_, retVal))
-               abort_message("std::__libcpp_tls_set failure in __cxa_get_globals()");
+               __abort_message("std::__libcpp_tls_set failure in __cxa_get_globals()");
         }
         return retVal;
     }
@@ -94,7 +94,7 @@ extern "C" {
     __cxa_eh_globals *__cxa_get_globals_fast() {
         // First time through, create the key.
         if (0 != std::__libcpp_execute_once(&flag_, construct_))
-            abort_message("execute once failure in __cxa_get_globals_fast()");
+            __abort_message("execute once failure in __cxa_get_globals_fast()");
         return static_cast<__cxa_eh_globals*>(std::__libcpp_tls_get(key_));
     }
 } // extern "C"
diff --git a/libcxxabi/src/cxa_guard_impl.h b/libcxxabi/src/cxa_guard_impl.h
@@ -91,7 +91,7 @@
 // the former.
 #ifdef BUILDING_CXA_GUARD
 #  include "abort_message.h"
-#  define ABORT_WITH_MESSAGE(...) ::abort_message(__VA_ARGS__)
+#  define ABORT_WITH_MESSAGE(...) ::__abort_message(__VA_ARGS__)
 #elif defined(TESTING_CXA_GUARD)
 #  define ABORT_WITH_MESSAGE(...) ::abort()
 #else
diff --git a/libcxxabi/src/cxa_handlers.cpp b/libcxxabi/src/cxa_handlers.cpp
@@ -33,7 +33,7 @@ __unexpected(unexpected_handler func)
 {
     func();
     // unexpected handler should not return
-    abort_message("unexpected_handler unexpectedly returned");
+    __abort_message("unexpected_handler unexpectedly returned");
 }
 
 __attribute__((noreturn))
@@ -58,13 +58,13 @@ __terminate(terminate_handler func) noexcept
 #endif // _LIBCXXABI_NO_EXCEPTIONS
         func();
         // handler should not return
-        abort_message("terminate_handler unexpectedly returned");
+        __abort_message("terminate_handler unexpectedly returned");
 #ifndef _LIBCXXABI_NO_EXCEPTIONS
     }
     catch (...)
     {
         // handler should not throw exception
-        abort_message("terminate_handler unexpectedly threw an exception");
+        __abort_message("terminate_handler unexpectedly threw an exception");
     }
 #endif // _LIBCXXABI_NO_EXCEPTIONS
 }
diff --git a/libcxxabi/src/cxa_thread_atexit.cpp b/libcxxabi/src/cxa_thread_atexit.cpp
@@ -89,7 +89,7 @@ namespace {
       // __cxa_thread_atexit() may be called arbitrarily late (for example, from
       // global destructors or atexit() handlers).
       if (std::__libcpp_tls_create(&dtors_key, run_dtors) != 0) {
-        abort_message("std::__libcpp_tls_create() failed in __cxa_thread_atexit()");
+        __abort_message("std::__libcpp_tls_create() failed in __cxa_thread_atexit()");
       }
     }
 
diff --git a/libcxxabi/src/cxa_vector.cpp b/libcxxabi/src/cxa_vector.cpp
@@ -121,7 +121,7 @@ void throw_bad_array_new_length() {
 #ifndef _LIBCXXABI_NO_EXCEPTIONS
   throw std::bad_array_new_length();
 #else
-  abort_message("__cxa_vec_new failed to allocate memory");
+  __abort_message("__cxa_vec_new failed to allocate memory");
 #endif
 }
 
diff --git a/libcxxabi/src/cxa_virtual.cpp b/libcxxabi/src/cxa_virtual.cpp
@@ -13,12 +13,12 @@ namespace __cxxabiv1 {
 extern "C" {
 _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN
 void __cxa_pure_virtual(void) {
-  abort_message("Pure virtual function called!");
+  __abort_message("Pure virtual function called!");
 }
 
 _LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN
 void __cxa_deleted_virtual(void) {
-  abort_message("Deleted virtual function called!");
+  __abort_message("Deleted virtual function called!");
 }
 } // extern "C"
 } // abi
diff --git a/libcxxabi/src/demangle/DemangleConfig.h b/libcxxabi/src/demangle/DemangleConfig.h
@@ -15,7 +15,7 @@
 // build systems to override this value.
 // https://libcxx.llvm.org/UsingLibcxx.html#enabling-the-safe-libc-mode
 #ifndef _LIBCPP_VERBOSE_ABORT
-#define _LIBCPP_VERBOSE_ABORT(...) abort_message(__VA_ARGS__)
+#define _LIBCPP_VERBOSE_ABORT(...) __abort_message(__VA_ARGS__)
 #include "../abort_message.h"
 #endif
 
diff --git a/libcxxabi/src/stdlib_new_delete.cpp b/libcxxabi/src/stdlib_new_delete.cpp
@@ -32,14 +32,14 @@ inline void __throw_bad_alloc_shim() {
 #ifndef _LIBCPP_HAS_NO_EXCEPTIONS
   throw std::bad_alloc();
 #else
-  abort_message("bad_alloc was thrown in -fno-exceptions mode");
+  __abort_message("bad_alloc was thrown in -fno-exceptions mode");
 #endif
 }
 
 #define _LIBCPP_ASSERT_SHIM(expr, str)                                                                                 \
   do {                                                                                                                 \
     if (!expr)                                                                                                         \
-      abort_message(str);                                                                                              \
+      __abort_message(str);                                                                                            \
   } while (false)
 
 // ------------------ BEGIN COPY ------------------

Original file line number	Diff line number	Diff line change
`@@ -26,7 +26,7 @@`
`26`	`26`	`# define _LIBCXXABI_USE_CRASHREPORTER_CLIENT`
`27`	`27`	`#endif`
`28`	`28`
`29`		`-void abort_message(const char* format, ...)`
	`29`	`+void __abort_message(const char* format, ...)`
`30`	`30`	`{`
`31`	`31`	`// Write message to stderr. We do this before formatting into a`
`32`	`32`	`// variable-size buffer so that we still get some information if`
Original file line number	Diff line number	Diff line change
`@@ -30,18 +30,18 @@ static void demangling_terminate_handler()`
`30`	`30`
`31`	`31`	`// If there is no uncaught exception, just note that we're terminating`
`32`	`32`	`if (!globals)`
`33`		`- abort_message("terminating");`
	`33`	`+ __abort_message("terminating");`
`34`	`34`
`35`	`35`	`__cxa_exception* exception_header = globals->caughtExceptions;`
`36`	`36`	`if (!exception_header)`
`37`		`- abort_message("terminating");`
	`37`	`+ __abort_message("terminating");`
`38`	`38`
`39`	`39`	`_Unwind_Exception* unwind_exception =`
`40`	`40`	`reinterpret_cast<_Unwind_Exception*>(exception_header + 1) - 1;`
`41`	`41`
`42`	`42`	`// If we're terminating due to a foreign exception`
`43`	`43`	`if (!__isOurExceptionClass(unwind_exception))`
`44`		`- abort_message("terminating due to %s foreign exception", cause);`
	`44`	`+ __abort_message("terminating due to %s foreign exception", cause);`
`45`	`45`
`46`	`46`	`void* thrown_object =`
`47`	`47`	`__getExceptionClass(unwind_exception) == kOurDependentExceptionClass ?`
`@@ -67,19 +67,19 @@ static void demangling_terminate_handler()`
`67`	`67`	`{`
`68`	`68`	`// Include the what() message from the exception`
`69`	`69`	`const std::exception* e = static_cast<const std::exception*>(thrown_object);`
`70`		`- abort_message("terminating due to %s exception of type %s: %s", cause, name, e->what());`
	`70`	`+ __abort_message("terminating due to %s exception of type %s: %s", cause, name, e->what());`
`71`	`71`	`}`
`72`	`72`	`else`
`73`	`73`	`{`
`74`	`74`	`// Else just note that we're terminating due to an exception`
`75`		`- abort_message("terminating due to %s exception of type %s", cause, name);`
	`75`	`+ __abort_message("terminating due to %s exception of type %s", cause, name);`
`76`	`76`	`}`
`77`	`77`	`}`
`78`	`78`	`#else // !_LIBCXXABI_NO_EXCEPTIONS`
`79`	`79`	`__attribute__((noreturn))`
`80`	`80`	`static void demangling_terminate_handler()`
`81`	`81`	`{`
`82`		`- abort_message("terminating");`
	`82`	`+ __abort_message("terminating");`
`83`	`83`	`}`
`84`	`84`	`#endif // !_LIBCXXABI_NO_EXCEPTIONS`
`85`	`85`
Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ __unexpected(unexpected_handler func)`
`33`	`33`	`{`
`34`	`34`	`func();`
`35`	`35`	`// unexpected handler should not return`
`36`		`- abort_message("unexpected_handler unexpectedly returned");`
	`36`	`+ __abort_message("unexpected_handler unexpectedly returned");`
`37`	`37`	`}`
`38`	`38`
`39`	`39`	`__attribute__((noreturn))`
`@@ -58,13 +58,13 @@ __terminate(terminate_handler func) noexcept`
`58`	`58`	`#endif // _LIBCXXABI_NO_EXCEPTIONS`
`59`	`59`	`func();`
`60`	`60`	`// handler should not return`
`61`		`- abort_message("terminate_handler unexpectedly returned");`
	`61`	`+ __abort_message("terminate_handler unexpectedly returned");`
`62`	`62`	`#ifndef _LIBCXXABI_NO_EXCEPTIONS`
`63`	`63`	`}`
`64`	`64`	`catch (...)`
`65`	`65`	`{`
`66`	`66`	`// handler should not throw exception`
`67`		`- abort_message("terminate_handler unexpectedly threw an exception");`
	`67`	`+ __abort_message("terminate_handler unexpectedly threw an exception");`
`68`	`68`	`}`
`69`	`69`	`#endif // _LIBCXXABI_NO_EXCEPTIONS`
`70`	`70`	`}`
Original file line number	Diff line number	Diff line change
`@@ -89,7 +89,7 @@ namespace {`
`89`	`89`	`// __cxa_thread_atexit() may be called arbitrarily late (for example, from`
`90`	`90`	`// global destructors or atexit() handlers).`
`91`	`91`	`if (std::__libcpp_tls_create(&dtors_key, run_dtors) != 0) {`
`92`		`- abort_message("std::__libcpp_tls_create() failed in __cxa_thread_atexit()");`
	`92`	`+ __abort_message("std::__libcpp_tls_create() failed in __cxa_thread_atexit()");`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ void throw_bad_array_new_length() {`
`121`	`121`	`#ifndef _LIBCXXABI_NO_EXCEPTIONS`
`122`	`122`	`throw std::bad_array_new_length();`
`123`	`123`	`#else`
`124`		`- abort_message("__cxa_vec_new failed to allocate memory");`
	`124`	`+ __abort_message("__cxa_vec_new failed to allocate memory");`
`125`	`125`	`#endif`
`126`	`126`	`}`
`127`	`127`
Original file line number	Diff line number	Diff line change
`@@ -13,12 +13,12 @@ namespace __cxxabiv1 {`
`13`	`13`	`extern "C" {`
`14`	`14`	`_LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN`
`15`	`15`	`void __cxa_pure_virtual(void) {`
`16`		`- abort_message("Pure virtual function called!");`
	`16`	`+ __abort_message("Pure virtual function called!");`
`17`	`17`	`}`
`18`	`18`
`19`	`19`	`_LIBCXXABI_FUNC_VIS _LIBCXXABI_NORETURN`
`20`	`20`	`void __cxa_deleted_virtual(void) {`
`21`		`- abort_message("Deleted virtual function called!");`
	`21`	`+ __abort_message("Deleted virtual function called!");`
`22`	`22`	`}`
`23`	`23`	`} // extern "C"`
`24`	`24`	`} // abi`