add thunks for operator new and operator delete

Reviewed By: Orvid Differential Revision: D46865108 fbshipit-source-id: 6f25d1216e971a5dc0552ad2fbd3017ac0e76d85
facebook · Jun 23, 2023 · 96d31e8 · 96d31e8
1 parent c82d4fb
commit 96d31e8
Show file tree

Hide file tree

Showing 2 changed files with 23 additions and 0 deletions.
diff --git a/folly/lang/Thunk.h b/folly/lang/Thunk.h
@@ -19,6 +19,7 @@
 #include <exception>
 
 #include <folly/Utility.h>
+#include <folly/lang/New.h>
 
 namespace folly {
 namespace detail {
@@ -73,6 +74,19 @@ struct thunk {
     return ::new (dst) T(static_cast<T&&>(*reinterpret_cast<T*>(src)));
   }
 
+  template <std::size_t Size, std::size_t Align>
+  static void* operator_new() {
+    return folly::operator_new(Size, align_val_t(Align));
+  }
+  template <std::size_t Size, std::size_t Align>
+  static void* operator_new_nx() {
+    return folly::operator_new(Size, align_val_t(Align), std::nothrow);
+  }
+  template <std::size_t Size, std::size_t Align>
+  static void operator_delete(void* const ptr) noexcept {
+    return folly::operator_delete(ptr, Size, align_val_t(Align));
+  }
+
   template <typename... A>
   static void noop(A...) noexcept {}
 

diff --git a/folly/lang/test/ThunkTest.cpp b/folly/lang/test/ThunkTest.cpp
@@ -93,4 +93,13 @@ TEST_F(ThunkTest, ctor_dtor) {
   }
 }
 
+TEST_F(ThunkTest, operator_new_delete) {
+  auto ptr = thunk::operator_new<64, 32>();
+  EXPECT_NE(nullptr, ptr);
+  thunk::operator_delete<64, 32>(ptr);
+  ptr = thunk::operator_new_nx<64, 32>();
+  EXPECT_NE(nullptr, ptr);
+  thunk::operator_delete<64, 32>(ptr);
+}
+
 } // namespace folly::detail