Re-enabled preinit and fixed interceptor initialization order.

Author: icmccorm

compiler-rt/lib/bsan/CMakeLists.txt

@@ -55,7 +55,7 @@ add_compiler_rt_object_libraries(RTBsan
   CFLAGS ${BSAN_CFLAGS}
   DEPS ${BSAN_DEPS})
 
-if(!APPLE)
+if(NOT APPLE)
   add_compiler_rt_object_libraries(RTBsan_preinit
     OS ${SANITIZER_COMMON_SUPPORTED_OS}
     ARCHS ${BSAN_SUPPORTED_ARCH}
@@ -86,6 +86,7 @@ else()
     STATIC
     ARCHS ${BSAN_SUPPORTED_ARCH}
     OBJECT_LIBS RTBsan
+                RTBsan_preinit
                 ${BSAN_COMMON_RUNTIME_OBJECT_LIBS}
     LINK_FLAGS ${BSAN_LINK_FLAGS}
     CFLAGS ${BSAN_CFLAGS}

compiler-rt/lib/bsan/bsan_interceptors.cpp

@@ -135,7 +135,11 @@ void InitializeBsanInterceptors() {
   static bool was_called_once;
   CHECK(!was_called_once);
   was_called_once = true;
+  BSAN_INTERCEPT_FUNC(malloc);
+  BSAN_INTERCEPT_FUNC(free);
+  
   InitializeCommonInterceptors();
+
 }
 
 } // namespace __bsan