wuggy/Dactyloidae
wuggy/Dactyloidae
1
0
Fork 0
mirror of https://repo.dactyloidae.xyz/Dactyloidae/UXP.git synced 2026-09-09 09:18:42 +09:00
Code Issues Projects Releases Packages Wiki Activity

Issue #1956 - Allow building with newer MSVC versions.

Browse source 
(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
Download patch file Download diff file Expand all files Collapse all files

4
memory/mozalloc/moz.build
View file

@ -16,10 +16,6 @@ if CONFIG['WRAP_STL_INCLUDES']:
elif CONFIG['_MSC_VER']:
DEFINES['_HAS_EXCEPTIONS'] = 0
if CONFIG['MOZ_MSVC_STL_WRAP_RAISE']:
EXPORTS.mozilla += [
'msvc_raise_wrappers.h',
'throw_msvc.h',
]
SOURCES += [
'msvc_raise_wrappers.cpp',
]

63
memory/mozalloc/msvc_raise_wrappers.cpp
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;

41
memory/mozalloc/msvc_raise_wrappers.h
View file

@ -1,41 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: sw=4 ts=4 et :
*/
/* This Source Code Form is subject to the terms of the Mozilla Public
* 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/. */
#ifndef mozilla_msvc_raise_wrappers_h
#define mozilla_msvc_raise_wrappers_h
#ifdef _XSTDDEF_
# error "Unable to wrap _RAISE(); CRT _RAISE() already defined"
#endif
#ifdef _XUTILITY_
# error "Unable to wrap _X[exception](); CRT versions already declared"
#endif
#ifdef _FUNCTIONAL_
# error "Unable to wrap _Xbad_function_call(); CRT version already declared"
#endif
#include "mozilla/mozalloc_abort.h"
// xutility will declare the following functions in the std namespace.
// We #define them to be named differently so we can ensure the exception
// throwing semantics of these functions work exactly the way we want, by
// defining our own versions in msvc_raise_wrappers.cpp.
# define _Xinvalid_argument moz_Xinvalid_argument
# define _Xlength_error moz_Xlength_error
# define _Xout_of_range moz_Xout_of_range
# define _Xoverflow_error moz_Xoverflow_error
# define _Xruntime_error moz_Xruntime_error
// used by <functional>
# define _Xbad_function_call moz_Xbad_function_call
# include <xstddef>
# include <xutility>
# undef _RAISE
# define _RAISE(x) mozalloc_abort((x).what())
#endif // ifndef mozilla_msvc_raise_wrappers_h

17
memory/mozalloc/throw_msvc.h
View file

@ -1,17 +0,0 @@
/* -*- Mode: C++; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*-
* vim: sw=4 ts=4 et :
*/
/* This Source Code Form is subject to the terms of the Mozilla Public
* 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/. */
#ifndef mozilla_throw_msvc_h
#define mozilla_throw_msvc_h
#if defined(MOZ_MSVC_STL_WRAP_RAISE)
# include "msvc_raise_wrappers.h"
#else
# error "Unknown STL wrapper tactic"
#endif
#endif // mozilla_throw_msvc_h