Skip to content

Commit 7b6c0ce

Browse files
committed
Revert ""Reland "[hwasan] Provide aliases for c allocation functions for Fuchsia""
This reverts commit 1190a1d. This probably broke https://lab.llvm.org/buildbot/#/builders/77/builds/26043/steps/21/logs/stdio again.
1 parent 3524a9f commit 7b6c0ce

File tree

1 file changed

+7
-2
lines changed

1 file changed

+7
-2
lines changed

compiler-rt/lib/hwasan/hwasan_allocation_functions.cpp

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,9 +16,10 @@
1616
#include "interception/interception.h"
1717
#include "sanitizer_common/sanitizer_allocator_dlsym.h"
1818
#include "sanitizer_common/sanitizer_allocator_interface.h"
19-
#include "sanitizer_common/sanitizer_mallinfo.h"
2019
#include "sanitizer_common/sanitizer_tls_get_addr.h"
2120

21+
#if !SANITIZER_FUCHSIA
22+
2223
using namespace __hwasan;
2324

2425
struct DlsymAlloc : public DlSymAllocator<DlsymAlloc> {
@@ -154,8 +155,10 @@ void *__sanitizer_malloc(uptr size) {
154155

155156
} // extern "C"
156157

157-
#if HWASAN_WITH_INTERCEPTORS || SANITIZER_FUCHSIA
158+
#if HWASAN_WITH_INTERCEPTORS
158159
# define INTERCEPTOR_ALIAS(RET, FN, ARGS...) \
160+
extern "C" SANITIZER_INTERFACE_ATTRIBUTE RET WRAP(FN)(ARGS) \
161+
ALIAS("__sanitizer_" #FN); \
159162
extern "C" SANITIZER_INTERFACE_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE RET FN( \
160163
ARGS) ALIAS("__sanitizer_" #FN)
161164

@@ -180,3 +183,5 @@ INTERCEPTOR_ALIAS(int, mallopt, int cmd, int value);
180183
INTERCEPTOR_ALIAS(void, malloc_stats, void);
181184
# endif
182185
#endif // #if HWASAN_WITH_INTERCEPTORS
186+
187+
#endif // SANITIZER_FUCHSIA

0 commit comments

Comments
 (0)