[compiler-rt] 6f9d84b - Revert "hwasan: Disable operator {new, delete} interceptors when interceptors are disabled."

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2020-10-24T15:04:22-04:00
New Revision: 6f9d84bb26f15845e984170be40f7c1383425eea

URL: https://github.com/llvm/llvm-project/commit/6f9d84bb26f15845e984170be40f7c1383425eea
DIFF: https://github.com/llvm/llvm-project/commit/6f9d84bb26f15845e984170be40f7c1383425eea.diff

LOG: Revert "hwasan: Disable operator {new,delete} interceptors when interceptors are disabled."

This reverts commit fa66bcf4bc9467514dddacdba711a42e0a83cf9d.
Seems to break tests, see https://reviews.llvm.org/D89827#2351930

Added: 
    

Modified: 
    compiler-rt/lib/hwasan/hwasan.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/hwasan/hwasan.h b/compiler-rt/lib/hwasan/hwasan.h
index d4521efd089a..b8b7a1865e86 100644
--- a/compiler-rt/lib/hwasan/hwasan.h
+++ b/compiler-rt/lib/hwasan/hwasan.h
@@ -21,6 +21,10 @@
 #include "hwasan_flags.h"
 #include "ubsan/ubsan_platform.h"
 
+#ifndef HWASAN_REPLACE_OPERATORS_NEW_AND_DELETE
+# define HWASAN_REPLACE_OPERATORS_NEW_AND_DELETE 1
+#endif
+
 #ifndef HWASAN_CONTAINS_UBSAN
 # define HWASAN_CONTAINS_UBSAN CAN_SANITIZE_UB
 #endif
@@ -29,10 +33,6 @@
 #define HWASAN_WITH_INTERCEPTORS 0
 #endif
 
-#ifndef HWASAN_REPLACE_OPERATORS_NEW_AND_DELETE
-#define HWASAN_REPLACE_OPERATORS_NEW_AND_DELETE HWASAN_WITH_INTERCEPTORS
-#endif
-
 typedef u8 tag_t;
 
 // TBI (Top Byte Ignore) feature of AArch64: bits [63:56] are ignored in address