Consolidate hot_cold-hinted new implementation into malloc extension.

PiperOrigin-RevId: 699233090 Change-Id: Ia032f900ab69c4a98048c07868dfe2b22473ffd6
google · Nov 22, 2024 · 0b936f8 · 0b936f8
1 parent 78e9b9b
commit 0b936f8
Show file tree

Hide file tree

Showing 5 changed files with 69 additions and 90 deletions.
diff --git a/tcmalloc/BUILD b/tcmalloc/BUILD
@@ -1231,9 +1231,9 @@ cc_library(
 
 cc_library(
     name = "new_extension",
-    srcs = ["new_extension.cc"],
     hdrs = ["new_extension.h"],
     copts = TCMALLOC_DEFAULT_COPTS,
+    deprecation = "Use :malloc_extension directly",
     visibility = [":__subpackages__"],
     deps = [
         ":malloc_extension",

diff --git a/tcmalloc/malloc_extension.cc b/tcmalloc/malloc_extension.cc
@@ -893,3 +893,50 @@ tcmalloc_size_returning_operator_new_aligned_hot_cold_nothrow(
 }
 
 #endif  // _LIBCPP_VERSION && __cpp_aligned_new
+
+ABSL_ATTRIBUTE_WEAK void* operator new(
+    size_t size, tcmalloc::hot_cold_t hot_cold) noexcept(false) {
+  return ::operator new(size);
+}
+
+ABSL_ATTRIBUTE_WEAK void* operator new(size_t size, const std::nothrow_t&,
+                                       tcmalloc::hot_cold_t hot_cold) noexcept {
+  return ::operator new(size, std::nothrow);
+}
+
+ABSL_ATTRIBUTE_WEAK void* operator new[](
+    size_t size, tcmalloc::hot_cold_t hot_cold) noexcept(false) {
+  return ::operator new[](size);
+}
+
+ABSL_ATTRIBUTE_WEAK void* operator new[](
+    size_t size, const std::nothrow_t&,
+    tcmalloc::hot_cold_t hot_cold) noexcept {
+  return ::operator new[](size, std::nothrow);
+}
+
+#ifdef __cpp_aligned_new
+ABSL_ATTRIBUTE_WEAK void* operator new(
+    size_t size, std::align_val_t alignment,
+    tcmalloc::hot_cold_t hot_cold) noexcept(false) {
+  return ::operator new(size, alignment);
+}
+
+ABSL_ATTRIBUTE_WEAK void* operator new(size_t size, std::align_val_t alignment,
+                                       const std::nothrow_t&,
+                                       tcmalloc::hot_cold_t hot_cold) noexcept {
+  return ::operator new(size, alignment, std::nothrow);
+}
+
+ABSL_ATTRIBUTE_WEAK void* operator new[](
+    size_t size, std::align_val_t alignment,
+    tcmalloc::hot_cold_t hot_cold) noexcept(false) {
+  return ::operator new[](size, alignment);
+}
+
+ABSL_ATTRIBUTE_WEAK void* operator new[](
+    size_t size, std::align_val_t alignment, const std::nothrow_t&,
+    tcmalloc::hot_cold_t hot_cold) noexcept {
+  return ::operator new[](size, alignment, std::nothrow);
+}
+#endif  // __cpp_aligned_new
diff --git a/tcmalloc/malloc_extension.h b/tcmalloc/malloc_extension.h
@@ -770,6 +770,27 @@ __sized_ptr_t tcmalloc_size_returning_operator_new_aligned_hot_cold_nothrow(
 
 }  // extern "C"
 
+void* operator new(size_t size, tcmalloc::hot_cold_t hot_cold) noexcept(false);
+void* operator new(size_t size, const std::nothrow_t&,
+                   tcmalloc::hot_cold_t hot_cold) noexcept;
+void* operator new[](size_t size,
+                     tcmalloc::hot_cold_t hot_cold) noexcept(false);
+void* operator new[](size_t size, const std::nothrow_t&,
+                     tcmalloc::hot_cold_t hot_cold) noexcept;
+
+#ifdef __cpp_aligned_new
+void* operator new(size_t size, std::align_val_t alignment,
+                   tcmalloc::hot_cold_t hot_cold) noexcept(false);
+void* operator new(size_t size, std::align_val_t alignment,
+                   const std::nothrow_t&,
+                   tcmalloc::hot_cold_t hot_cold) noexcept;
+void* operator new[](size_t size, std::align_val_t alignment,
+                     tcmalloc::hot_cold_t hot_cold) noexcept(false);
+void* operator new[](size_t size, std::align_val_t alignment,
+                     const std::nothrow_t&,
+                     tcmalloc::hot_cold_t hot_cold) noexcept;
+#endif  // __cpp_aligned_new
+
 #ifndef MALLOCX_LG_ALIGN
 #define MALLOCX_LG_ALIGN(la) (la)
 #endif

diff --git a/tcmalloc/new_extension.cc b/tcmalloc/new_extension.cc
diff --git a/tcmalloc/new_extension.h b/tcmalloc/new_extension.h
@@ -20,25 +20,4 @@
 
 #include "tcmalloc/malloc_extension.h"
 
-void* operator new(size_t size, tcmalloc::hot_cold_t hot_cold) noexcept(false);
-void* operator new(size_t size, const std::nothrow_t&,
-                   tcmalloc::hot_cold_t hot_cold) noexcept;
-void* operator new[](size_t size,
-                     tcmalloc::hot_cold_t hot_cold) noexcept(false);
-void* operator new[](size_t size, const std::nothrow_t&,
-                     tcmalloc::hot_cold_t hot_cold) noexcept;
-
-#ifdef __cpp_aligned_new
-void* operator new(size_t size, std::align_val_t alignment,
-                   tcmalloc::hot_cold_t hot_cold) noexcept(false);
-void* operator new(size_t size, std::align_val_t alignment,
-                   const std::nothrow_t&,
-                   tcmalloc::hot_cold_t hot_cold) noexcept;
-void* operator new[](size_t size, std::align_val_t alignment,
-                     tcmalloc::hot_cold_t hot_cold) noexcept(false);
-void* operator new[](size_t size, std::align_val_t alignment,
-                     const std::nothrow_t&,
-                     tcmalloc::hot_cold_t hot_cold) noexcept;
-#endif  // __cpp_aligned_new
-
 #endif  // TCMALLOC_NEW_EXTENSION_H_