Revert "[HWASAN] Enable memcpy, memmove and memset interceptors (#70387)"

Breaks build bots, details in #70387.

This reverts commit 91cdd7d.

Author: vitalybuka

compiler-rt/lib/hwasan/hwasan_interceptors.cpp

@@ -90,7 +90,8 @@ struct HWAsanInterceptorContext {
 #    include "sanitizer_common/sanitizer_syscalls_netbsd.inc"
 
 #    define COMMON_INTERCEPTOR_WRITE_RANGE(ctx, ptr, size) \
-      HWASAN_WRITE_RANGE(ctx, ptr, size)
+      do {                                                 \
+      } while (false)
 
 #    define COMMON_INTERCEPTOR_READ_RANGE(ctx, ptr, size) \
       HWASAN_READ_RANGE(ctx, ptr, size)
@@ -146,6 +147,30 @@ struct HWAsanInterceptorContext {
         (void)(name);                           \
       } while (false)
 
+#    define COMMON_INTERCEPTOR_MEMMOVE_IMPL(ctx, to, from, size) \
+      do {                                                       \
+        (void)(ctx);                                             \
+        (void)(to);                                              \
+        (void)(from);                                            \
+        (void)(size);                                            \
+      } while (false)
+
+#    define COMMON_INTERCEPTOR_MEMCPY_IMPL(ctx, to, from, size) \
+      do {                                                      \
+        (void)(ctx);                                            \
+        (void)(to);                                             \
+        (void)(from);                                           \
+        (void)(size);                                           \
+      } while (false)
+
+#    define COMMON_INTERCEPTOR_MEMSET_IMPL(ctx, block, c, size) \
+      do {                                                      \
+        (void)(ctx);                                            \
+        (void)(block);                                          \
+        (void)(c);                                              \
+        (void)(size);                                           \
+      } while (false)
+
 #    define COMMON_INTERCEPTOR_STRERROR() \
       do {                                \
       } while (false)

compiler-rt/lib/hwasan/hwasan_platform_interceptors.h

@@ -56,14 +56,14 @@
 #undef SANITIZER_INTERCEPT_STRCASECMP
 #define SANITIZER_INTERCEPT_STRCASECMP 0
 
-// #undef SANITIZER_INTERCEPT_MEMSET
-// #define SANITIZER_INTERCEPT_MEMSET 0
+#undef SANITIZER_INTERCEPT_MEMSET
+#define SANITIZER_INTERCEPT_MEMSET 0
 
-// #undef SANITIZER_INTERCEPT_MEMMOVE
-// #define SANITIZER_INTERCEPT_MEMMOVE 0
+#undef SANITIZER_INTERCEPT_MEMMOVE
+#define SANITIZER_INTERCEPT_MEMMOVE 0
 
-// #undef SANITIZER_INTERCEPT_MEMCPY
-// #define SANITIZER_INTERCEPT_MEMCPY 0
+#undef SANITIZER_INTERCEPT_MEMCPY
+#define SANITIZER_INTERCEPT_MEMCPY 0
 
 // #undef SANITIZER_INTERCEPT_MEMCMP
 // #define SANITIZER_INTERCEPT_MEMCMP 0

compiler-rt/test/hwasan/TestCases/bcmp.cpp

@@ -4,32 +4,25 @@
 // RUN: %clangxx_hwasan -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
 // REQUIRES: !android
 
-#include <assert.h>
 #include <sanitizer/hwasan_interface.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-__attribute__((no_sanitize("hwaddress"))) void
-ForceCallInterceptor(void *p, const void *a, size_t size) {
-  assert(bcmp(p, a, size) == 0);
-}
-
 int main(int argc, char **argv) {
   __hwasan_enable_allocator_tagging();
   char a[] = {static_cast<char>(argc), 2, 3, 4};
   int size = sizeof(a);
   char *p = (char *)malloc(size);
   memcpy(p, a, size);
   free(p);
-  ForceCallInterceptor(p, a, size);
-  return 0;
+  return bcmp(p, a, size);
   // CHECK: HWAddressSanitizer: tag-mismatch on address
   // CHECK: READ of size 4
-  // CHECK: #{{[[:digit:]]+}} 0x{{[[:xdigit:]]+}} in main {{.*}}bcmp.cpp:[[@LINE-4]]
+  // CHECK: #{{[[:digit:]]+}} 0x{{[[:xdigit:]]+}} in main {{.*}}bcmp.cpp:[[@LINE-3]]
   // CHECK: Cause: use-after-free
   // CHECK: freed by thread
-  // CHECK: #{{[[:digit:]]+}} 0x{{[[:xdigit:]]+}} in main {{.*}}bcmp.cpp:[[@LINE-8]]
+  // CHECK: #{{[[:digit:]]+}} 0x{{[[:xdigit:]]+}} in main {{.*}}bcmp.cpp:[[@LINE-7]]
   // CHECK: previously allocated by thread
-  // CHECK: #{{[[:digit:]]+}} 0x{{[[:xdigit:]]+}} in main {{.*}}bcmp.cpp:[[@LINE-12]]
+  // CHECK: #{{[[:digit:]]+}} 0x{{[[:xdigit:]]+}} in main {{.*}}bcmp.cpp:[[@LINE-11]]
 }

compiler-rt/test/hwasan/TestCases/memcmp.cpp

@@ -3,32 +3,25 @@
 // RUN: %clangxx_hwasan -O2 %s -o %t && not %run %t 2>&1 | FileCheck %s
 // RUN: %clangxx_hwasan -O3 %s -o %t && not %run %t 2>&1 | FileCheck %s
 
-#include <assert.h>
 #include <sanitizer/hwasan_interface.h>
 #include <stdlib.h>
 #include <string.h>
 #include <unistd.h>
 
-__attribute__((no_sanitize("hwaddress"))) void
-ForceCallInterceptor(void *p, const void *a, size_t size) {
-  assert(memcmp(p, a, size) == 0);
-}
-
 int main(int argc, char **argv) {
   __hwasan_enable_allocator_tagging();
   char a[] = {static_cast<char>(argc), 2, 3, 4};
   int size = sizeof(a);
   char *p = (char *)malloc(size);
   memcpy(p, a, size);
   free(p);
-  ForceCallInterceptor(p, a, size);
-  return 0;
+  return memcmp(p, a, size);
   // CHECK: HWAddressSanitizer: tag-mismatch on address
   // CHECK: READ of size 4
-  // CHECK: #{{[[:digit:]]+}} 0x{{[[:xdigit:]]+}} in main {{.*}}memcmp.cpp:[[@LINE-4]]
+  // CHECK: #{{[[:digit:]]+}} 0x{{[[:xdigit:]]+}} in main {{.*}}memcmp.cpp:[[@LINE-3]]
   // CHECK: Cause: use-after-free
   // CHECK: freed by thread
-  // CHECK: #{{[[:digit:]]+}} 0x{{[[:xdigit:]]+}} in main {{.*}}memcmp.cpp:[[@LINE-8]]
+  // CHECK: #{{[[:digit:]]+}} 0x{{[[:xdigit:]]+}} in main {{.*}}memcmp.cpp:[[@LINE-7]]
   // CHECK: previously allocated by thread
-  // CHECK: #{{[[:digit:]]+}} 0x{{[[:xdigit:]]+}} in main {{.*}}memcmp.cpp:[[@LINE-12]]
+  // CHECK: #{{[[:digit:]]+}} 0x{{[[:xdigit:]]+}} in main {{.*}}memcmp.cpp:[[@LINE-11]]
 }