Revert "[sanitizer] Fix return type of __bzero and __aeabi_mem* interceptors."

Breaks TSan on Mac, which does
  return REAL(func)(...
in COMMON_INTERCEPTOR_ENTER, which is not OK when REAL(func) has return
type of void.

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@355256 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 3 insertions, 3 deletions

diff --git a/lib/msan/msan_interceptors.cc b/lib/msan/msan_interceptors.cc
index ab1582fac..58b9c39e3 100644
--- a/lib/msan/msan_interceptors.cc
+++ b/lib/msan/msan_interceptors.cc
@@ -1311,17 +1311,17 @@ int OnExit() {
 #define COMMON_INTERCEPTOR_MEMSET_IMPL(ctx, block, c, size) \
   {                                                         \
     (void)ctx;                                              \
-    __msan_memset(block, c, size);                          \
+    return __msan_memset(block, c, size);                   \
   }
 #define COMMON_INTERCEPTOR_MEMMOVE_IMPL(ctx, to, from, size) \
   {                                                          \
     (void)ctx;                                               \
-    __msan_memmove(to, from, size);                          \
+    return __msan_memmove(to, from, size);                   \
   }
 #define COMMON_INTERCEPTOR_MEMCPY_IMPL(ctx, to, from, size) \
   {                                                         \
     (void)ctx;                                              \
-    __msan_memcpy(to, from, size);                          \
+    return __msan_memcpy(to, from, size);                   \
   }
 
 #define COMMON_INTERCEPTOR_COPY_STRING(ctx, to, from, size) \