[compiler-rt] 864b3a3 - Reland "hwasan: Disable operator {new, delete} interceptors when interceptors are disabled."

[Peter Collingbourne via llvm-commits]

Author: Peter Collingbourne
Date: 2020-10-28T15:42:23-07:00
New Revision: 864b3a336b609f8261e727e332235ccedd2e825e

URL: https://github.com/llvm/llvm-project/commit/864b3a336b609f8261e727e332235ccedd2e825e
DIFF: https://github.com/llvm/llvm-project/commit/864b3a336b609f8261e727e332235ccedd2e825e.diff

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

There was a discrepancy in the gn build which is now fixed.

Differential Revision: https://reviews.llvm.org/D89827

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 b8b7a1865e86..d4521efd089a 100644
--- a/compiler-rt/lib/hwasan/hwasan.h
+++ b/compiler-rt/lib/hwasan/hwasan.h
@@ -21,10 +21,6 @@
 #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
@@ -33,6 +29,10 @@
 #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