diff options
Diffstat (limited to 'memory/mozalloc/msvc_raise_wrappers.cpp')
-rw-r--r-- | memory/mozalloc/msvc_raise_wrappers.cpp | 65 |
1 files changed, 12 insertions, 53 deletions
diff --git a/memory/mozalloc/msvc_raise_wrappers.cpp b/memory/mozalloc/msvc_raise_wrappers.cpp index 820663f63b..a9f844986c 100644 --- a/memory/mozalloc/msvc_raise_wrappers.cpp +++ b/memory/mozalloc/msvc_raise_wrappers.cpp @@ -5,59 +5,18 @@ * License, v. 2.0. If a copy of the MPL was not distributed with this * file, You can obtain one at http://mozilla.org/MPL/2.0/. */ -#include <stdio.h> - +#include <exception> #include "mozalloc_abort.h" -__declspec(noreturn) static void abort_from_exception(const char* const which, - const char* const what); -static void -abort_from_exception(const char* const which, const char* const what) -{ - fprintf(stderr, "fatal: STL threw %s: ", which); - mozalloc_abort(what); -} - -namespace std { - -// NB: user code is not supposed to touch the std:: namespace. We're -// doing this after careful review because we want to define our own -// exception throwing semantics. Don't try this at home! - -MFBT_API __declspec(noreturn) void -moz_Xinvalid_argument(const char* what) -{ - abort_from_exception("invalid_argument", what); -} - -MFBT_API __declspec(noreturn) void -moz_Xlength_error(const char* what) -{ - abort_from_exception("length_error", what); -} - -MFBT_API __declspec(noreturn) void -moz_Xout_of_range(const char* what) -{ - abort_from_exception("out_of_range", what); -} - -MFBT_API __declspec(noreturn) void -moz_Xoverflow_error(const char* what) -{ - abort_from_exception("overflow_error", what); -} - -MFBT_API __declspec(noreturn) void -moz_Xruntime_error(const char* what) -{ - abort_from_exception("runtime_error", what); -} - -MFBT_API __declspec(noreturn) void -moz_Xbad_function_call() -{ +static void __cdecl +RaiseHandler(const std::exception& e) + { abort_from_exception("bad_function_call", "bad function call"); -} - -} // namespace std + mozalloc_abort(e.what()); + } + +static struct StaticScopeStruct final { + StaticScopeStruct() { + std::exception::_Set_raise_handler(RaiseHandler); + } +} StaticScopeInvoke; |