diff --git a/compiler-rt/lib/hwasan/hwasan.h b/compiler-rt/lib/hwasan/hwasan.h --- 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