Issue #1956 - Allow building with newer MSVC versions.

(P.S.: this rev is partly imported from upstream, without binaries. -Roy)
This commit is contained in:
Jeremy Andrews 2022-07-01 17:43:55 -05:00 committed by roytam1
commit ccd69e165d
6 changed files with 14 additions and 151 deletions

View file

@ -3,59 +3,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");
}
mozalloc_abort(e.what());
}
} // namespace std
static struct StaticScopeStruct final {
StaticScopeStruct() {
std::exception::_Set_raise_handler(RaiseHandler);
}
} StaticScopeInvoke;