From 3e8458ab54c7cbaec45e367b2da909c6f94b291c Mon Sep 17 00:00:00 2001 From: Alexander Potapenko Date: Wed, 24 Oct 2012 09:19:16 +0000 Subject: [ASan] Use internal_memmove() in both static and dynamic runtime libraries if asan_inited != 0. git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@166549 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/asan/asan_interceptors.cc | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/lib/asan/asan_interceptors.cc b/lib/asan/asan_interceptors.cc index 1fec3b6dd..d679863ea 100644 --- a/lib/asan/asan_interceptors.cc +++ b/lib/asan/asan_interceptors.cc @@ -249,9 +249,7 @@ INTERCEPTOR(void*, memcpy, void *to, const void *from, uptr size) { } INTERCEPTOR(void*, memmove, void *to, const void *from, uptr size) { -#if MAC_INTERPOSE_FUNCTIONS - if (!asan_inited) return REAL(memmove)(to, from, size); -#endif + if (!asan_inited) return internal_memmove(to, from, size); if (asan_init_is_running) { return REAL(memmove)(to, from, size); } -- cgit v1.2.1