Index: compiler-rt/trunk/lib/hwasan/hwasan_new_delete.cpp =================================================================== --- compiler-rt/trunk/lib/hwasan/hwasan_new_delete.cpp +++ compiler-rt/trunk/lib/hwasan/hwasan_new_delete.cpp @@ -35,15 +35,15 @@ if (!nothrow && UNLIKELY(!res)) ReportOutOfMemory(size, &stack);\ return res -INTERCEPTOR_ATTRIBUTE +INTERCEPTOR_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE void *operator new(size_t size) { OPERATOR_NEW_BODY(false /*nothrow*/); } -INTERCEPTOR_ATTRIBUTE +INTERCEPTOR_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE void *operator new[](size_t size) { OPERATOR_NEW_BODY(false /*nothrow*/); } -INTERCEPTOR_ATTRIBUTE +INTERCEPTOR_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE void *operator new(size_t size, std::nothrow_t const&) { OPERATOR_NEW_BODY(true /*nothrow*/); } -INTERCEPTOR_ATTRIBUTE +INTERCEPTOR_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE void *operator new[](size_t size, std::nothrow_t const&) { OPERATOR_NEW_BODY(true /*nothrow*/); } @@ -52,13 +52,13 @@ GET_MALLOC_STACK_TRACE; \ if (ptr) hwasan_free(ptr, &stack) -INTERCEPTOR_ATTRIBUTE +INTERCEPTOR_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE void operator delete(void *ptr) NOEXCEPT { OPERATOR_DELETE_BODY; } -INTERCEPTOR_ATTRIBUTE +INTERCEPTOR_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE void operator delete[](void *ptr) NOEXCEPT { OPERATOR_DELETE_BODY; } -INTERCEPTOR_ATTRIBUTE +INTERCEPTOR_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE void operator delete(void *ptr, std::nothrow_t const&) { OPERATOR_DELETE_BODY; } -INTERCEPTOR_ATTRIBUTE +INTERCEPTOR_ATTRIBUTE SANITIZER_WEAK_ATTRIBUTE void operator delete[](void *ptr, std::nothrow_t const&) { OPERATOR_DELETE_BODY; } Index: compiler-rt/trunk/test/hwasan/TestCases/override-new-delete.cpp =================================================================== --- compiler-rt/trunk/test/hwasan/TestCases/override-new-delete.cpp +++ compiler-rt/trunk/test/hwasan/TestCases/override-new-delete.cpp @@ -0,0 +1,23 @@ +// RUN: %clangxx_hwasan %s +#include +#include + +char *__dummy; + +void *operator new(size_t size) { return __dummy; } +void *operator new[](size_t size) { return __dummy; } +void *operator new(size_t size, std::nothrow_t const&) noexcept { + return __dummy; +} +void *operator new[](size_t size, std::nothrow_t const&) noexcept { + return __dummy; +} + +void operator delete(void *ptr) noexcept {} +void operator delete[](void *ptr) noexcept {} +void operator delete(void *ptr, std::nothrow_t const&) noexcept {} +void operator delete[](void *ptr, std::nothrow_t const&) noexcept {} + +int main() { + return 0; +}