diff options
author | Louis Dionne <ldionne.2@gmail.com> | 2023-06-14 13:59:45 -0700 |
---|---|---|
committer | Louis Dionne <ldionne.2@gmail.com> | 2023-06-16 09:40:08 -0400 |
commit | d53cf0fdd1047534e309fb7a27bd25a962be1c83 (patch) | |
tree | 51b33e7e24dfbb29dc2e6d89088903a4351d7547 /libcxxabi | |
parent | 459f495f49a197a042890e1daa0a98cbae892d2b (diff) | |
download | llvm-d53cf0fdd1047534e309fb7a27bd25a962be1c83.zip llvm-d53cf0fdd1047534e309fb7a27bd25a962be1c83.tar.gz llvm-d53cf0fdd1047534e309fb7a27bd25a962be1c83.tar.bz2 |
[libc++] Make libc++ and libc++abi's definitions of operator new be exact copies
This allows mechanically copying any changes made to `operator new`
from libc++ into libc++abi as-is. This is also a step towards
de-duplicating this code entirely.
Differential Revision: https://reviews.llvm.org/D153035
Diffstat (limited to 'libcxxabi')
-rw-r--r-- | libcxxabi/src/stdlib_new_delete.cpp | 96 |
1 files changed, 53 insertions, 43 deletions
diff --git a/libcxxabi/src/stdlib_new_delete.cpp b/libcxxabi/src/stdlib_new_delete.cpp index 483b9f1..efe09c6 100644 --- a/libcxxabi/src/stdlib_new_delete.cpp +++ b/libcxxabi/src/stdlib_new_delete.cpp @@ -4,8 +4,6 @@ // See https://llvm.org/LICENSE.txt for license information. // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception // -// -// This file implements the new and delete operators. //===----------------------------------------------------------------------===// #include "__cxxabi_config.h" @@ -13,15 +11,26 @@ #include <cstdlib> #include <new> -#if !defined(_THROW_BAD_ALLOC) || !defined(_LIBCXXABI_WEAK) -#error The _THROW_BAD_ALLOC and _LIBCXXABI_WEAK libc++ macros must \ - already be defined by libc++. +// Perform a few sanity checks on libc++ and libc++abi macros to ensure that +// the code below can be an exact copy of the code in libcxx/src/new.cpp. +#if !defined(_THROW_BAD_ALLOC) +# error The _THROW_BAD_ALLOC macro should be already defined by libc++ +#endif + +#ifndef _LIBCPP_WEAK +# error The _LIBCPP_WEAK macro should be already defined by libc++ #endif + +#if defined(_LIBCXXABI_NO_EXCEPTIONS) != defined(_LIBCPP_HAS_NO_EXCEPTIONS) +# error libc++ and libc++abi seem to disagree on whether exceptions are enabled +#endif + +// ------------------ BEGIN COPY ------------------ // Implement all new and delete operators as weak definitions // in this shared library, so that they can be overridden by programs // that define non-weak copies of the functions. -_LIBCXXABI_WEAK +_LIBCPP_WEAK void * operator new(std::size_t size) _THROW_BAD_ALLOC { @@ -36,7 +45,7 @@ operator new(std::size_t size) _THROW_BAD_ALLOC if (nh) nh(); else -#ifndef _LIBCXXABI_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS throw std::bad_alloc(); #else break; @@ -45,87 +54,87 @@ operator new(std::size_t size) _THROW_BAD_ALLOC return p; } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void* operator new(size_t size, const std::nothrow_t&) noexcept { void* p = nullptr; -#ifndef _LIBCXXABI_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCXXABI_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS p = ::operator new(size); -#ifndef _LIBCXXABI_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { } -#endif // _LIBCXXABI_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS return p; } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void* operator new[](size_t size) _THROW_BAD_ALLOC { return ::operator new(size); } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void* operator new[](size_t size, const std::nothrow_t&) noexcept { void* p = nullptr; -#ifndef _LIBCXXABI_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCXXABI_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS p = ::operator new[](size); -#ifndef _LIBCXXABI_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { } -#endif // _LIBCXXABI_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS return p; } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void operator delete(void* ptr) noexcept { ::free(ptr); } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void operator delete(void* ptr, const std::nothrow_t&) noexcept { ::operator delete(ptr); } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void operator delete(void* ptr, size_t) noexcept { ::operator delete(ptr); } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void operator delete[] (void* ptr) noexcept { ::operator delete(ptr); } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void operator delete[] (void* ptr, const std::nothrow_t&) noexcept { ::operator delete[](ptr); } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void operator delete[] (void* ptr, size_t) noexcept { @@ -134,7 +143,7 @@ operator delete[] (void* ptr, size_t) noexcept #if !defined(_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION) -_LIBCXXABI_WEAK +_LIBCPP_WEAK void * operator new(std::size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC { @@ -156,7 +165,7 @@ operator new(std::size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC if (nh) nh(); else { -#ifndef _LIBCXXABI_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS throw std::bad_alloc(); #else break; @@ -166,87 +175,87 @@ operator new(std::size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC return p; } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void* operator new(size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept { void* p = nullptr; -#ifndef _LIBCXXABI_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCXXABI_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS p = ::operator new(size, alignment); -#ifndef _LIBCXXABI_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { } -#endif // _LIBCXXABI_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS return p; } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void* operator new[](size_t size, std::align_val_t alignment) _THROW_BAD_ALLOC { return ::operator new(size, alignment); } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void* operator new[](size_t size, std::align_val_t alignment, const std::nothrow_t&) noexcept { void* p = nullptr; -#ifndef _LIBCXXABI_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS try { -#endif // _LIBCXXABI_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS p = ::operator new[](size, alignment); -#ifndef _LIBCXXABI_NO_EXCEPTIONS +#ifndef _LIBCPP_HAS_NO_EXCEPTIONS } catch (...) { } -#endif // _LIBCXXABI_NO_EXCEPTIONS +#endif // _LIBCPP_HAS_NO_EXCEPTIONS return p; } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void operator delete(void* ptr, std::align_val_t) noexcept { std::__libcpp_aligned_free(ptr); } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void operator delete(void* ptr, std::align_val_t alignment, const std::nothrow_t&) noexcept { ::operator delete(ptr, alignment); } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void operator delete(void* ptr, size_t, std::align_val_t alignment) noexcept { ::operator delete(ptr, alignment); } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void operator delete[] (void* ptr, std::align_val_t alignment) noexcept { ::operator delete(ptr, alignment); } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void operator delete[] (void* ptr, std::align_val_t alignment, const std::nothrow_t&) noexcept { ::operator delete[](ptr, alignment); } -_LIBCXXABI_WEAK +_LIBCPP_WEAK void operator delete[] (void* ptr, size_t, std::align_val_t alignment) noexcept { @@ -254,3 +263,4 @@ operator delete[] (void* ptr, size_t, std::align_val_t alignment) noexcept } #endif // !_LIBCPP_HAS_NO_LIBRARY_ALIGNED_ALLOCATION +// ------------------ END COPY ------------------ |