Fix macos: Cleanup includes

Author: vogelsgesang

libcxx/include/__exception/exception_ptr.h

@@ -16,6 +16,7 @@
 #include <__memory/construct_at.h>
 #include <__type_traits/decay.h>
 #include <__type_traits/is_pointer.h>
+#include <__verbose_abort> // used by exception_ptr_{unimplemented,cxxabi}.ipp
 #include <cstdlib>
 #include <typeinfo>
 

libcxx/include/__exception/exception_ptr_cxxabi.ipp

@@ -7,8 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <__exception/terminate.h>
-
 namespace __cxxabiv1 {
 
 extern "C" {
@@ -44,7 +42,7 @@ _LIBCPP_EXPORTED_FROM_LIB_INLINEABLE exception_ptr current_exception() _NOEXCEPT
 _LIBCPP_EXPORTED_FROM_LIB_INLINEABLE void rethrow_exception(exception_ptr __ptr) {
   __cxxabiv1::__cxa_rethrow_primary_exception(__ptr.__ptr_);
   // if __ptr.__ptr_ is NULL, above returns so we terminate.
-  terminate();
+  _LIBCPP_VERBOSE_ABORT("tried to rethrow an empty exception_ptr\n");
 }
 
 } // namespace std

libcxx/include/__exception/exception_ptr_msvc.ipp

@@ -7,8 +7,6 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include <stdlib.h>
-
 _LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrCreate(void*);
 _LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrDestroy(void*);
 _LIBCPP_CRT_FUNC void __cdecl __ExceptionPtrCopy(void*, const void*);

libcxx/include/__exception/exception_ptr_unimplemented.ipp

@@ -17,20 +17,20 @@ namespace std {
 
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_ALWAYS_INLINE inline void exception_ptr::__increment_refcount(void* __ptr) _NOEXCEPT {
   if (__ptr)
-    __libcpp_verbose_abort("exception_ptr not yet implemented\n");
+    _LIBCPP_VERBOSE_ABORT("exception_ptr not yet implemented\n");
 }
 
 _LIBCPP_HIDE_FROM_ABI _LIBCPP_ALWAYS_INLINE inline void exception_ptr::__decrement_refcount(void* __ptr) _NOEXCEPT {
   if (__ptr)
-    __libcpp_verbose_abort("exception_ptr not yet implemented\n");
+    _LIBCPP_VERBOSE_ABORT("exception_ptr not yet implemented\n");
 }
 
 _LIBCPP_EXPORTED_FROM_LIB_INLINEABLE exception_ptr current_exception() _NOEXCEPT {
-  __libcpp_verbose_abort("exception_ptr not yet implemented\n");
+  _LIBCPP_VERBOSE_ABORT("exception_ptr not yet implemented\n");
 }
 
 _LIBCPP_EXPORTED_FROM_LIB_INLINEABLE [[noreturn]] void rethrow_exception(exception_ptr p) {
-  __libcpp_verbose_abort("exception_ptr not yet implemented\n");
+  _LIBCPP_VERBOSE_ABORT("exception_ptr not yet implemented\n");
 }
 
 } // namespace std