Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-09 03:15:11 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1476597 - Stop using dynamic exception specification in mozalloc.h. r=froydnj

Browse Source 
--HG--
extra : rebase_source : 48047a82e42dc7688fb3ed484d01794ccbd86763
This commit is contained in:
Masatoshi Kimura 2018-07-18 20:36:25 +09:00
parent 6c9f589b45
commit cc03337492
1 changed files with 13 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
memory/mozalloc/mozalloc.h
View File

@ -106,11 +106,11 @@ MOZ_END_EXTERN_C
*
* (1) the matching infallible operator delete immediately below
* (2) the matching system |operator delete(void*, std::nothrow)|
* (3) the matching system |operator delete(void*) throw(std::bad_alloc)|
* (3) the matching system |operator delete(void*) noexcept(false)|
*
* NB: these are declared |throw(std::bad_alloc)|, though they will never
* NB: these are declared |noexcept(false)|, though they will never
* throw that exception. This declaration is consistent with the rule
* that |::operator new() throw(std::bad_alloc)| will never return NULL.
* that |::operator new() noexcept(false)| will never return NULL.
*
* NB: mozilla::fallible can be used instead of std::nothrow.
*/
@ -124,26 +124,6 @@ MOZ_END_EXTERN_C
# define MOZALLOC_EXPORT_NEW
#endif
#if defined(_MSC_VER)
/*
* Suppress build warning spam (bug 578546).
*/
#if _MSC_VER < 1912
#define MOZALLOC_THROW_IF_HAS_EXCEPTIONS
#else
#define MOZALLOC_THROW_IF_HAS_EXCEPTIONS throw()
#endif
#define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS
#else
/*
* C++11 has deprecated exception-specifications in favour of |noexcept|.
*/
#define MOZALLOC_THROW_IF_HAS_EXCEPTIONS noexcept(true)
#define MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS noexcept(false)
#endif
#define MOZALLOC_THROW_BAD_ALLOC MOZALLOC_THROW_BAD_ALLOC_IF_HAS_EXCEPTIONS
MOZALLOC_EXPORT_NEW
#if defined(__GNUC__) && !defined(__clang__) && defined(__SANITIZE_ADDRESS__)
/* gcc's asan somehow doesn't like always_inline on this function. */
@ -151,49 +131,49 @@ __attribute__((gnu_inline)) inline
#else
MOZ_ALWAYS_INLINE_EVEN_DEBUG
#endif
void* operator new(size_t size) MOZALLOC_THROW_BAD_ALLOC
void* operator new(size_t size) noexcept(false)
{
return moz_xmalloc(size);
}
MOZALLOC_EXPORT_NEW MOZ_ALWAYS_INLINE_EVEN_DEBUG
void* operator new(size_t size, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS
void* operator new(size_t size, const std::nothrow_t&) noexcept(true)
{
return malloc_impl(size);
}
MOZALLOC_EXPORT_NEW MOZ_ALWAYS_INLINE_EVEN_DEBUG
void* operator new[](size_t size) MOZALLOC_THROW_BAD_ALLOC
void* operator new[](size_t size) noexcept(false)
{
return moz_xmalloc(size);
}
MOZALLOC_EXPORT_NEW MOZ_ALWAYS_INLINE_EVEN_DEBUG
void* operator new[](size_t size, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS
void* operator new[](size_t size, const std::nothrow_t&) noexcept(true)
{
return malloc_impl(size);
}
MOZALLOC_EXPORT_NEW MOZ_ALWAYS_INLINE_EVEN_DEBUG
void operator delete(void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS
void operator delete(void* ptr) noexcept(true)
{
return free_impl(ptr);
}
MOZALLOC_EXPORT_NEW MOZ_ALWAYS_INLINE_EVEN_DEBUG
void operator delete(void* ptr, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS
void operator delete(void* ptr, const std::nothrow_t&) noexcept(true)
{
return free_impl(ptr);
}
MOZALLOC_EXPORT_NEW MOZ_ALWAYS_INLINE_EVEN_DEBUG
void operator delete[](void* ptr) MOZALLOC_THROW_IF_HAS_EXCEPTIONS
void operator delete[](void* ptr) noexcept(true)
{
return free_impl(ptr);
}
MOZALLOC_EXPORT_NEW MOZ_ALWAYS_INLINE_EVEN_DEBUG
void operator delete[](void* ptr, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_EXCEPTIONS
void operator delete[](void* ptr, const std::nothrow_t&) noexcept(true)
{
return free_impl(ptr);
}
@ -202,13 +182,13 @@ void operator delete[](void* ptr, const std::nothrow_t&) MOZALLOC_THROW_IF_HAS_E
// We provide the global sized delete overloads unconditionally because the
// MSVC runtime headers do, despite compiling with /Zc:sizedDealloc-
MOZALLOC_EXPORT_NEW MOZ_ALWAYS_INLINE_EVEN_DEBUG
void operator delete(void* ptr, size_t /*size*/) MOZALLOC_THROW_IF_HAS_EXCEPTIONS
void operator delete(void* ptr, size_t /*size*/) noexcept(true)
{
return free_impl(ptr);
}
MOZALLOC_EXPORT_NEW MOZ_ALWAYS_INLINE_EVEN_DEBUG
void operator delete[](void* ptr, size_t /*size*/) MOZALLOC_THROW_IF_HAS_EXCEPTIONS
void operator delete[](void* ptr, size_t /*size*/) noexcept(true)
{
return free_impl(ptr);
}