summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlexander Potapenko <glider@google.com>2012-10-24 09:19:16 +0000
committerAlexander Potapenko <glider@google.com>2012-10-24 09:19:16 +0000
commit3e8458ab54c7cbaec45e367b2da909c6f94b291c (patch)
tree40ca09afbbce5b68fe8604c3ce6ff9fcda69aefb
parent697a22bf050e81a6d94fdc0201a0c46215454e6a (diff)
downloadcompiler-rt-3e8458ab54c7cbaec45e367b2da909c6f94b291c.tar.gz
[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
-rw-r--r--lib/asan/asan_interceptors.cc4
1 files changed, 1 insertions, 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);
}