From 94df35d489dbc24cbc6252a6d2fe4d09ce9ccbef Mon Sep 17 00:00:00 2001 From: Piet Brauer Date: Wed, 7 Jun 2017 09:11:23 -0700 Subject: [PATCH] Revert "Remove LIBCXXABI_NORETURN for now" This reverts commit 6a23f12f996689db7dbc6464c111d58db311b552. --- Classes/BITCrashCXXExceptionHandler.mm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Classes/BITCrashCXXExceptionHandler.mm b/Classes/BITCrashCXXExceptionHandler.mm index c022869370..d4e8ab0393 100644 --- a/Classes/BITCrashCXXExceptionHandler.mm +++ b/Classes/BITCrashCXXExceptionHandler.mm @@ -58,7 +58,7 @@ static pthread_key_t _BITCrashCXXExceptionInfoTSDKey = 0; @implementation BITCrashUncaughtCXXExceptionHandlerManager -extern "C" void __cxa_throw(void *exception_object, std::type_info *tinfo, void (*dest)(void *)) +extern "C" void LIBCXXABI_NORETURN __cxa_throw(void *exception_object, std::type_info *tinfo, void (*dest)(void *)) { // Purposely do not take a lock in this function. The aim is to be as fast as // possible. While we could really use some of the info set up by the real @@ -72,7 +72,7 @@ extern "C" void __cxa_throw(void *exception_object, std::type_info *tinfo, void // implementation changing in a future version. (Or not existing in an earlier // version). - typedef void (*cxa_throw_func)(void *, std::type_info *, void (*)(void *)); + typedef void (*cxa_throw_func)(void *, std::type_info *, void (*)(void *)) LIBCXXABI_NORETURN; static dispatch_once_t predicate = 0; static cxa_throw_func __original__cxa_throw = nullptr; static const void **__real_objc_ehtype_vtable = nullptr;