From 4a0555a9d4d59dc2b0827f0841f8ab3a65322f01 Mon Sep 17 00:00:00 2001 From: Peter Collingbourne Date: Sun, 6 Oct 2013 22:13:24 +0000 Subject: [PATCH] Silence the unused function warning in exception.cpp. Rather than try to protect the function behind a precise, ever-changing #if expression, just inline it into every caller. git-svn-id: https://llvm.org/svn/llvm-project/libcxx/trunk@192077 91177308-0d34-0410-b5e6-96231b3b80d8 --- src/exception.cpp | 33 ++++++++++++++++----------------- 1 file changed, 16 insertions(+), 17 deletions(-) diff --git a/src/exception.cpp b/src/exception.cpp index e080f7c8e..9dbb1fae7 100644 --- a/src/exception.cpp +++ b/src/exception.cpp @@ -1,5 +1,3 @@ - - //===------------------------ exception.cpp -------------------------------===// // // The LLVM Compiler Infrastructure @@ -42,13 +40,6 @@ static std::unexpected_handler __unexpected_handler; #endif // __has_include() -_LIBCPP_NORETURN -static void _libcpp_abort(const char* msg) -{ - printf("%s\n", msg); - abort(); -} - namespace std { @@ -99,13 +90,15 @@ terminate() _NOEXCEPT #endif // _LIBCPP_NO_EXCEPTIONS (*get_terminate())(); // handler should not return - _libcpp_abort("terminate_handler unexpectedly returned\n"); + printf("terminate_handler unexpectedly returned\n"); + ::abort(); #ifndef _LIBCPP_NO_EXCEPTIONS } catch (...) { // handler should not throw exception - _libcpp_abort("terminate_handler unexpectedly threw an exception\n"); + printf("terminate_handler unexpectedly threw an exception\n"); + ::abort(); } #endif // _LIBCPP_NO_EXCEPTIONS } @@ -124,7 +117,8 @@ bool uncaught_exception() _NOEXCEPT # else # warning uncaught_exception not yet implemented # endif - _libcpp_abort("uncaught_exception not yet implemented\n"); + printf("uncaught_exception not yet implemented\n"); + ::abort(); #endif // __APPLE__ } @@ -196,7 +190,8 @@ exception_ptr::~exception_ptr() _NOEXCEPT # else # warning exception_ptr not yet implemented # endif - _libcpp_abort("exception_ptr not yet implemented\n"); + printf("exception_ptr not yet implemented\n"); + ::abort(); #endif } @@ -214,7 +209,8 @@ exception_ptr::exception_ptr(const exception_ptr& other) _NOEXCEPT # else # warning exception_ptr not yet implemented # endif - _libcpp_abort("exception_ptr not yet implemented\n"); + printf("exception_ptr not yet implemented\n"); + ::abort(); #endif } @@ -238,7 +234,8 @@ exception_ptr& exception_ptr::operator=(const exception_ptr& other) _NOEXCEPT # else # warning exception_ptr not yet implemented # endif - _libcpp_abort("exception_ptr not yet implemented\n"); + printf("exception_ptr not yet implemented\n"); + ::abort(); #endif } @@ -281,7 +278,8 @@ exception_ptr current_exception() _NOEXCEPT # else # warning exception_ptr not yet implemented # endif - _libcpp_abort("exception_ptr not yet implemented\n"); + printf("exception_ptr not yet implemented\n"); + ::abort(); #endif } @@ -302,7 +300,8 @@ void rethrow_exception(exception_ptr p) # else # warning exception_ptr not yet implemented # endif - _libcpp_abort("exception_ptr not yet implemented\n"); + printf("exception_ptr not yet implemented\n"); + ::abort(); #endif } } // std