commit f0d6d7c1415bef8c8dead89844760344d77c554c
author Dominic Chen <ddchen@apple.com> Wed Mar 16 13:35:51 2022 -0700
committer Copybara-Service <copybara-worker@google.com> Tue Mar 29 17:46:26 2022 -0700
tree 78ca4296f50ed810047f9ae9725a22ab7696b7b1
parent 1b79b0f2841f00e42272ba821d5cb6c4d7ba1284

[scudo] Provide allocator declaration

Ensure that extern allocator declaration is visible before definition

Differential Revision: https://reviews.llvm.org/D121848

GitOrigin-RevId: 6ba8c8abe982722f5e4383553d03c1c77f9dfbb0

wrappers_c.cpp

diff --git a/wrappers_c.cpp b/wrappers_c.cpp
index 81c7dd6..b4d51be 100644
--- a/wrappers_c.cpp
+++ b/wrappers_c.cpp
@@ -21,8 +21,6 @@
 #define SCUDO_PREFIX(name) name
 #define SCUDO_ALLOCATOR Allocator
 
-extern "C" void SCUDO_PREFIX(malloc_postinit)();
-
 // Export the static allocator so that the C++ wrappers can access it.
 // Technically we could have a completely separated heap for C & C++ but in
 // reality the amount of cross pollination between the two is staggering.

wrappers_c.h

diff --git a/wrappers_c.h b/wrappers_c.h
index 5f7f51f..08dc679 100644
--- a/wrappers_c.h
+++ b/wrappers_c.h
@@ -54,4 +54,9 @@
 #define SCUDO_MALLINFO __scudo_mallinfo
 #endif
 
+#if !SCUDO_ANDROID || !_BIONIC
+extern "C" void malloc_postinit();
+extern HIDDEN scudo::Allocator<scudo::Config, malloc_postinit> Allocator;
+#endif
+
 #endif // SCUDO_WRAPPERS_C_H_

wrappers_cpp.cpp

diff --git a/wrappers_cpp.cpp b/wrappers_cpp.cpp
index adb1041..16f495b 100644
--- a/wrappers_cpp.cpp
+++ b/wrappers_cpp.cpp
@@ -12,12 +12,10 @@
 #if !SCUDO_ANDROID || !_BIONIC
 
 #include "allocator_config.h"
+#include "wrappers_c.h"
 
 #include <stdint.h>
 
-extern "C" void malloc_postinit();
-extern HIDDEN scudo::Allocator<scudo::Config, malloc_postinit> Allocator;
-
 namespace std {
 struct nothrow_t {};
 enum class align_val_t : size_t {};