Fix return

Author: jakeegan

compiler-rt/lib/asan/asan_interceptors_memintrinsics.cpp

@@ -22,10 +22,18 @@
 
 using namespace __asan;
 
+// AIX does not intercept memcpy, so we have to use internal_memcpy.
+#if !SANITIZER_AIX
+  #define ASAN_MEMCPY_RETURN(to, from, size) \
+    return REAL(memcpy)(to, from, size)
+#else
+  #define ASAN_MEMCPY_RETURN(to, from, size) \
+    return internal_memcpy(to, from, size)
+#endif
+
 // memcpy is called during __asan_init() from the internals of printf(...).
 // We do not treat memcpy with to==from as a bug.
 // See http://llvm.org/bugs/show_bug.cgi?id=11763.
-// AIX does not intercept memcpy, so we have to use internal_memcpy.
 #define ASAN_MEMCPY_IMPL(ctx, to, from, size)                 \
   do {                                                        \
     if (LIKELY(replace_intrin_cached)) {                      \
@@ -36,12 +44,8 @@ using namespace __asan;
       ASAN_WRITE_RANGE(ctx, to, size);                        \
     } else if (UNLIKELY(!AsanInited())) {                     \
       return internal_memcpy(to, from, size);                 \
-    }
-#if !SANITIZER_AIX
-    return REAL(memcpy)(to, from, size);
-#else
-    return internal_memcpy(to, from, size);
-#endif
+    }                                                         \
+    ASAN_MEMCPY_RETURN(to, from, size);                       \
   } while (0)
 
 // memset is called inside Printf.