From dea853e840b772575ba78ff1090bc18e7292a566 Mon Sep 17 00:00:00 2001 From: Iain Sandoe Date: Fri, 16 Aug 2019 19:46:09 +0000 Subject: [PATCH] libsanitize, asan - reapply r272406 The entry in LOCAL_PATCHES was accidentally omitted. 2019-08-16 Iain Sandoe * asan/asan_interceptors.h: Reapply r272406. From-SVN: r274585 --- libsanitizer/ChangeLog | 4 ++++ libsanitizer/asan/asan_interceptors.h | 7 ++++++- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/libsanitizer/ChangeLog b/libsanitizer/ChangeLog index 3f098a8380b..0a315d83686 100644 --- a/libsanitizer/ChangeLog +++ b/libsanitizer/ChangeLog @@ -1,3 +1,7 @@ +2019-08-16 Iain Sandoe + + * asan/asan_interceptors.h: Reapply r272406. + 2019-08-15 Martin Liska * LOCAL_PATCHES: Add r274540 diff --git a/libsanitizer/asan/asan_interceptors.h b/libsanitizer/asan/asan_interceptors.h index 155ea4156ab..035a84e1a42 100644 --- a/libsanitizer/asan/asan_interceptors.h +++ b/libsanitizer/asan/asan_interceptors.h @@ -80,7 +80,12 @@ void InitializePlatformInterceptors(); #if ASAN_HAS_EXCEPTIONS && !SANITIZER_WINDOWS && !SANITIZER_SOLARIS && \ !SANITIZER_NETBSD # define ASAN_INTERCEPT___CXA_THROW 1 -# define ASAN_INTERCEPT___CXA_RETHROW_PRIMARY_EXCEPTION 1 +# if ! defined(ASAN_HAS_CXA_RETHROW_PRIMARY_EXCEPTION) \ + || ASAN_HAS_CXA_RETHROW_PRIMARY_EXCEPTION +# define ASAN_INTERCEPT___CXA_RETHROW_PRIMARY_EXCEPTION 1 +# else +# define ASAN_INTERCEPT___CXA_RETHROW_PRIMARY_EXCEPTION 0 +# endif # if defined(_GLIBCXX_SJLJ_EXCEPTIONS) || (SANITIZER_IOS && defined(__arm__)) # define ASAN_INTERCEPT__UNWIND_SJLJ_RAISEEXCEPTION 1 # else -- 2.30.2