[asan] Fix debug asan build link error

[vitalybuka]

compiler-rt/lib/asan/asan_malloc_local.h

28 ↗

(On Diff #199321)

can we make it always inline function?

[rnk]

compiler-rt/lib/asan/asan_malloc_local.h

28 ↗

(On Diff #199321)

We'd still need a macro with control flow because it returns early if the local pool is used.

[waltl]

I have problems getting this to compile. Let me work on it and either suggest in-line changes or make a new revision.

[waltl]

Here are the changes I needed to make to get this to compile for linux and Myriad.

compiler-rt/lib/asan/asan_malloc_local.h

25 ↗

(On Diff #199321)

We still need to keep this function -- it's used in asan_malloc_linux.cc.

28 ↗

(On Diff #199321)

#define MAYBE_ALLOCATE_FROM_LOCAL_POOL(nothrow) \

36 ↗

(On Diff #199321)

} while (0)

42 ↗

(On Diff #199321)

#define MAYBE_ALLOCATE_FROM_LOCAL_POOL(nothrow)

compiler-rt/lib/asan/asan_new_delete.cc

75 ↗

(On Diff #199321)

MAYBE_ALLOCATE_FROM_LOCAL_POOL(nothrow); \

82 ↗

(On Diff #199321)

MAYBE_ALLOCATE_FROM_LOCAL_POOL(nothrow); \

[rnk]

• various fixes to RTEMS / Myriad codepath

[rnk]

Sorry for the broken patch, I forgot to be extra careful on the codepaths I can't test, clearly. Does this work?

[waltl]

There is still a problem building for Linux. See comment below.

compiler-rt/lib/asan/asan_malloc_local.h

24 ↗

(On Diff #199698)

The code in asan_malloc_linux.cc that calls this function is used for many platforms, not just RTEMS, so we still need this function in the original form. Alternatively, we can fix asan_malloc_linux.cc so that only RTEMS call this function. Either solution is fine with me.

[rnk]

• test on Linux

[rnk]

compiler-rt/lib/asan/asan_malloc_local.h

24 ↗

(On Diff #199698)

I brought this back and tested asan on Linux.

lib/asan/asan_malloc_local.h

 //===----------------------------------------------------------------------===//
 
 #ifndef ASAN_MALLOC_LOCAL_H
 #define ASAN_MALLOC_LOCAL_H
 
 #include "sanitizer_common/sanitizer_platform.h"
 #include "asan_internal.h"
 
-// On RTEMS, we use the local pool to handle memory allocation when the ASan
-// run-time is not up.
 static INLINE bool EarlyMalloc() {
-  return SANITIZER_RTEMS && (!__asan::asan_inited ||
-                             __asan::asan_init_is_running);
+  return SANITIZER_RTEMS &&
+         (!__asan::asan_inited || __asan::asan_init_is_running);
 }
 
-void* MemalignFromLocalPool(uptr alignment, uptr size);
-
 #if SANITIZER_RTEMS
 
 bool IsFromLocalPool(const void *ptr);
+void *MemalignFromLocalPool(uptr alignment, uptr size);
+
+// On RTEMS, we use the local pool to handle memory allocation when the ASan
+// run-time is not up. This macro is expanded in the context of the operator new
+// implementation.
+#define MAYBE_ALLOCATE_FROM_LOCAL_POOL(nothrow)                    \
+  do {                                                             \
+    if (UNLIKELY(EarlyMalloc())) {                                 \
+      void *res = MemalignFromLocalPool(SHADOW_GRANULARITY, size); \
+      if (!nothrow)                                                \
+        CHECK(res);                                                \
+      return res;                                                  \
+    }                                                              \
+  } while (0)
 
-#define ALLOCATE_FROM_LOCAL_POOL UNLIKELY(EarlyMalloc())
 #define IS_FROM_LOCAL_POOL(ptr) UNLIKELY(IsFromLocalPool(ptr))
 
 #else  // SANITIZER_RTEMS
 
-#define ALLOCATE_FROM_LOCAL_POOL 0
+#define MAYBE_ALLOCATE_FROM_LOCAL_POOL(nothrow)
 #define IS_FROM_LOCAL_POOL(ptr) 0
 
 #endif  // SANITIZER_RTEMS
 
 #endif  // ASAN_MALLOC_LOCAL_H

lib/asan/asan_new_delete.cc

 namespace std {
 struct nothrow_t {};
 enum class align_val_t: size_t {};
 }  // namespace std
 
 // TODO(alekseyshl): throw std::bad_alloc instead of dying on OOM.
 // For local pool allocation, align to SHADOW_GRANULARITY to match asan
 // allocator behavior.
-#define OPERATOR_NEW_BODY(type, nothrow) \
-  if (ALLOCATE_FROM_LOCAL_POOL) {\
-    void *res = MemalignFromLocalPool(SHADOW_GRANULARITY, size);\
-    if (!nothrow) CHECK(res);\
-    return res;\
-  }\
-  GET_STACK_TRACE_MALLOC;\
-  void *res = asan_memalign(0, size, &stack, type);\
-  if (!nothrow && UNLIKELY(!res)) ReportOutOfMemory(size, &stack);\
+#define OPERATOR_NEW_BODY(type, nothrow)            \
+  MAYBE_ALLOCATE_FROM_LOCAL_POOL(nothrow);          \
+  GET_STACK_TRACE_MALLOC;                           \
+  void *res = asan_memalign(0, size, &stack, type); \
+  if (!nothrow && UNLIKELY(!res))                   \
+    ReportOutOfMemory(size, &stack);                \
   return res;
-#define OPERATOR_NEW_BODY_ALIGN(type, nothrow) \
-  if (ALLOCATE_FROM_LOCAL_POOL) {\
-    void *res = MemalignFromLocalPool((uptr)align, size);\
-    if (!nothrow) CHECK(res);\
-    return res;\
-  }\
-  GET_STACK_TRACE_MALLOC;\
-  void *res = asan_memalign((uptr)align, size, &stack, type);\
-  if (!nothrow && UNLIKELY(!res)) ReportOutOfMemory(size, &stack);\
+#define OPERATOR_NEW_BODY_ALIGN(type, nothrow)                \
+  MAYBE_ALLOCATE_FROM_LOCAL_POOL(nothrow);                    \
+  GET_STACK_TRACE_MALLOC;                                     \
+  void *res = asan_memalign((uptr)align, size, &stack, type); \
+  if (!nothrow && UNLIKELY(!res))                             \
+    ReportOutOfMemory(size, &stack);                          \
   return res;
 
 // On OS X it's not enough to just provide our own 'operator new' and
 // 'operator delete' implementations, because they're going to be in the
 // runtime dylib, and the main executable will depend on both the runtime
 // dylib and libstdc++, each of those'll have its implementation of new and
 // delete.
 // To make sure that C++ allocation/deallocation operators are overridden on