replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix new/delete exception specifications to match libc++ after r290845 

llvm-svn: 290847
This commit is contained in:
Eric Fiselier 2017-01-03 00:16:18 +00:00
parent 1013fe3c0c
commit 0afab98979
1 changed files with 13 additions and 44 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

57
libcxxabi/src/cxa_new_delete.cpp
View File

@ -14,6 +14,11 @@
#include <new>
#include <cstdlib>
#if !defined(_THROW_BAD_ALLOC) || !defined(_NOEXCEPT)
#error _THROW_BAD_ALLOC and _NOEXCEPT libc++ macros must already be defined \
by libc++.
#endif
/*
[new.delete.single]
@ -33,10 +38,7 @@
*/
__attribute__((__weak__, __visibility__("default")))
void *
operator new(std::size_t size)
#if !__has_feature(cxx_noexcept)
throw(std::bad_alloc)
#endif
operator new(std::size_t size) _THROW_BAD_ALLOC
{
if (size == 0)
size = 1;
@ -70,12 +72,7 @@ that call. Otherwise, returns a null pointer.
*/
__attribute__((__weak__, __visibility__("default")))
void*
operator new(size_t size, const std::nothrow_t&)
#if __has_feature(cxx_noexcept)
noexcept
#else
throw()
#endif
operator new(size_t size, const std::nothrow_t&) _NOEXCEPT
{
void* p = 0;
#ifndef _LIBCXXABI_NO_EXCEPTIONS
@ -99,10 +96,7 @@ Returns operator new(size).
*/
__attribute__((__weak__, __visibility__("default")))
void*
operator new[](size_t size)
#if !__has_feature(cxx_noexcept)
throw(std::bad_alloc)
#endif
operator new[](size_t size) _THROW_BAD_ALLOC
{
return ::operator new(size);
}
@ -115,12 +109,7 @@ of that call. Otherwise, returns a null pointer.
*/
__attribute__((__weak__, __visibility__("default")))
void*
operator new[](size_t size, const std::nothrow_t&)
#if __has_feature(cxx_noexcept)
noexcept
#else
throw()
#endif
operator new[](size_t size, const std::nothrow_t&) _NOEXCEPT
{
void* p = 0;
#ifndef _LIBCXXABI_NO_EXCEPTIONS
@ -145,12 +134,7 @@ earlier call to operator new.
*/
__attribute__((__weak__, __visibility__("default")))
void
operator delete(void* ptr)
#if __has_feature(cxx_noexcept)
noexcept
#else
throw()
#endif
operator delete(void* ptr) _NOEXCEPT
{
if (ptr)
std::free(ptr);
@ -163,12 +147,7 @@ calls operator delete(ptr)
*/
__attribute__((__weak__, __visibility__("default")))
void
operator delete(void* ptr, const std::nothrow_t&)
#if __has_feature(cxx_noexcept)
noexcept
#else
throw()
#endif
operator delete(void* ptr, const std::nothrow_t&) _NOEXCEPT
{
::operator delete(ptr);
}
@ -180,12 +159,7 @@ Calls operator delete(ptr)
*/
__attribute__((__weak__, __visibility__("default")))
void
operator delete[] (void* ptr)
#if __has_feature(cxx_noexcept)
noexcept
#else
throw()
#endif
operator delete[] (void* ptr) _NOEXCEPT
{
::operator delete(ptr);
}
@ -197,12 +171,7 @@ calls operator delete[](ptr)
*/
__attribute__((__weak__, __visibility__("default")))
void
operator delete[] (void* ptr, const std::nothrow_t&)
#if __has_feature(cxx_noexcept)
noexcept
#else
throw()
#endif
operator delete[] (void* ptr, const std::nothrow_t&) _NOEXCEPT
{
::operator delete[](ptr);
}