generic-library/cxx
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Silence the unused function warning in exception.cpp.

Browse Source 
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
This commit is contained in:
Peter Collingbourne 2013-10-06 22:13:24 +00:00
parent ece95914ac
commit 4a0555a9d4
1 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
src/exception.cpp
View File

@ -1,5 +1,3 @@
//===------------------------ exception.cpp -------------------------------===// //===------------------------ exception.cpp -------------------------------===//
// //
// The LLVM Compiler Infrastructure // The LLVM Compiler Infrastructure
@ -42,13 +40,6 @@
static std::unexpected_handler __unexpected_handler; static std::unexpected_handler __unexpected_handler;
#endif // __has_include(<cxxabi.h>) #endif // __has_include(<cxxabi.h>)
_LIBCPP_NORETURN
static void _libcpp_abort(const char* msg)
{
printf("%s\n", msg);
abort();
}
namespace std namespace std
{ {
@ -99,13 +90,15 @@ terminate() _NOEXCEPT
#endif // _LIBCPP_NO_EXCEPTIONS #endif // _LIBCPP_NO_EXCEPTIONS
(*get_terminate())(); (*get_terminate())();
// handler should not return // handler should not return
_libcpp_abort("terminate_handler unexpectedly returned\n"); printf("terminate_handler unexpectedly returned\n");
::abort();
#ifndef _LIBCPP_NO_EXCEPTIONS #ifndef _LIBCPP_NO_EXCEPTIONS
} }
catch (...) catch (...)
{ {
// handler should not throw exception // 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 #endif // _LIBCPP_NO_EXCEPTIONS
} }
@ -124,7 +117,8 @@ bool uncaught_exception() _NOEXCEPT
# else # else
# warning uncaught_exception not yet implemented # warning uncaught_exception not yet implemented
# endif # endif
_libcpp_abort("uncaught_exception not yet implemented\n"); printf("uncaught_exception not yet implemented\n");
::abort();
#endif // __APPLE__ #endif // __APPLE__
} }
@ -196,7 +190,8 @@ exception_ptr::~exception_ptr() _NOEXCEPT
# else # else
# warning exception_ptr not yet implemented # warning exception_ptr not yet implemented
# endif # endif
_libcpp_abort("exception_ptr not yet implemented\n"); printf("exception_ptr not yet implemented\n");
::abort();
#endif #endif
} }
@ -214,7 +209,8 @@ exception_ptr::exception_ptr(const exception_ptr& other) _NOEXCEPT
# else # else
# warning exception_ptr not yet implemented # warning exception_ptr not yet implemented
# endif # endif
_libcpp_abort("exception_ptr not yet implemented\n"); printf("exception_ptr not yet implemented\n");
::abort();
#endif #endif
} }
@ -238,7 +234,8 @@ exception_ptr& exception_ptr::operator=(const exception_ptr& other) _NOEXCEPT
# else # else
# warning exception_ptr not yet implemented # warning exception_ptr not yet implemented
# endif # endif
_libcpp_abort("exception_ptr not yet implemented\n"); printf("exception_ptr not yet implemented\n");
::abort();
#endif #endif
} }
@ -281,7 +278,8 @@ exception_ptr current_exception() _NOEXCEPT
# else # else
# warning exception_ptr not yet implemented # warning exception_ptr not yet implemented
# endif # endif
_libcpp_abort("exception_ptr not yet implemented\n"); printf("exception_ptr not yet implemented\n");
::abort();
#endif #endif
} }
@ -302,7 +300,8 @@ void rethrow_exception(exception_ptr p)
# else # else
# warning exception_ptr not yet implemented # warning exception_ptr not yet implemented
# endif # endif
_libcpp_abort("exception_ptr not yet implemented\n"); printf("exception_ptr not yet implemented\n");
::abort();
#endif #endif
} }
} // std } // std