aboutsummaryrefslogtreecommitdiff
path: root/dep/jemalloc/src/jemalloc_cpp.cpp
diff options
context:
space:
mode:
authorjackpoz <giacomopoz@gmail.com>2018-05-11 20:36:14 +0200
committerShauren <shauren.trinity@gmail.com>2021-09-26 20:50:35 +0200
commit501bb9dc6702f8130ccd077bad30828705454a01 (patch)
treec092752bb73ed7ef212ad31516e08e23e2eb123c /dep/jemalloc/src/jemalloc_cpp.cpp
parent9c65f4e27c360464869dc401453ebc5c7ba3d78b (diff)
Dep/Jemalloc: Update to Jemalloc 5.1.0
(cherry picked from commit 8fe74bf0f90aab0b23d5ff21079cba4201bb4fdf)
Diffstat (limited to 'dep/jemalloc/src/jemalloc_cpp.cpp')
-rw-r--r--dep/jemalloc/src/jemalloc_cpp.cpp23
1 files changed, 16 insertions, 7 deletions
diff --git a/dep/jemalloc/src/jemalloc_cpp.cpp b/dep/jemalloc/src/jemalloc_cpp.cpp
index 844ab398a71..f0ceddae33a 100644
--- a/dep/jemalloc/src/jemalloc_cpp.cpp
+++ b/dep/jemalloc/src/jemalloc_cpp.cpp
@@ -39,12 +39,10 @@ void operator delete(void *ptr, std::size_t size) noexcept;
void operator delete[](void *ptr, std::size_t size) noexcept;
#endif
-template <bool IsNoExcept>
-void *
-newImpl(std::size_t size) noexcept(IsNoExcept) {
- void *ptr = je_malloc(size);
- if (likely(ptr != nullptr))
- return ptr;
+JEMALLOC_NOINLINE
+static void *
+handleOOM(std::size_t size, bool nothrow) {
+ void *ptr = nullptr;
while (ptr == nullptr) {
std::new_handler handler;
@@ -68,11 +66,22 @@ newImpl(std::size_t size) noexcept(IsNoExcept) {
ptr = je_malloc(size);
}
- if (ptr == nullptr && !IsNoExcept)
+ if (ptr == nullptr && !nothrow)
std::__throw_bad_alloc();
return ptr;
}
+template <bool IsNoExcept>
+JEMALLOC_ALWAYS_INLINE
+void *
+newImpl(std::size_t size) noexcept(IsNoExcept) {
+ void *ptr = je_malloc(size);
+ if (likely(ptr != nullptr))
+ return ptr;
+
+ return handleOOM(size, IsNoExcept);
+}
+
void *
operator new(std::size_t size) {
return newImpl<false>(size);