PR Comments: Introduce dlsym allocator

Author: cjappl

compiler-rt/lib/rtsan/rtsan_interceptors.cpp

@@ -10,6 +10,8 @@
 
 #include "rtsan/rtsan_interceptors.h"
 
+#include "interception/interception.h"
+#include "sanitizer_common/sanitizer_allocator_dlsym.h"
 #include "sanitizer_common/sanitizer_allocator_internal.h"
 #include "sanitizer_common/sanitizer_platform.h"
 #include "sanitizer_common/sanitizer_platform_interceptors.h"
@@ -40,6 +42,12 @@ using namespace __sanitizer;
 using __rtsan::rtsan_init_is_running;
 using __rtsan::rtsan_initialized;
 
+namespace {
+struct DlsymAlloc : public DlSymAllocator<DlsymAlloc> {
+  static bool UseImpl() { return !rtsan_initialized; }
+};
+} // namespace
+
 void ExpectNotRealtime(const char *intercepted_function_name) {
   __rtsan::GetContextForThisThread().ExpectNotRealtime(
       intercepted_function_name);
@@ -243,16 +251,16 @@ INTERCEPTOR(int, nanosleep, const struct timespec *rqtp,
 // Memory
 
 INTERCEPTOR(void *, calloc, SIZE_T num, SIZE_T size) {
-  if (rtsan_init_is_running && REAL(calloc) == nullptr)
-    return __sanitizer::InternalCalloc(num, size);
+  if (DlsymAlloc::Use())
+    return DlsymAlloc::Callocate(num, size);
 
   ExpectNotRealtime("calloc");
   return REAL(calloc)(num, size);
 }
 
 INTERCEPTOR(void, free, void *ptr) {
-  if (__sanitizer::internal_allocator()->PointerIsMine(ptr))
-    return __sanitizer::InternalFree(ptr);
+  if (DlsymAlloc::PointerIsMine(ptr))
+    return DlsymAlloc::Free(ptr);
 
   if (ptr != NULL) {
     ExpectNotRealtime("free");
@@ -261,16 +269,16 @@ INTERCEPTOR(void, free, void *ptr) {
 }
 
 INTERCEPTOR(void *, malloc, SIZE_T size) {
-  if (rtsan_init_is_running && REAL(malloc) == nullptr)
-    return __sanitizer::InternalAlloc(size);
+  if (DlsymAlloc::Use())
+    return DlsymAlloc::Allocate(size);
 
   ExpectNotRealtime("malloc");
   return REAL(malloc)(size);
 }
 
 INTERCEPTOR(void *, realloc, void *ptr, SIZE_T size) {
-  if (rtsan_init_is_running && REAL(realloc) == nullptr)
-    return __sanitizer::InternalRealloc(ptr, size);
+  if (DlsymAlloc::Use() || DlsymAlloc::PointerIsMine(ptr))
+    return DlsymAlloc::Realloc(ptr, size);
 
   ExpectNotRealtime("realloc");
   return REAL(realloc)(ptr, size);