[gcc r11-9436] libstdc++: Make Asan detection work for Clang [PR103453]

[gcc r11-9436] libstdc++: Make Asan detection work for Clang [PR103453]

[Jonathan Wakely]

https://gcc.gnu.org/g:ad54d3fb8f09babc43ea46a93cc73cd623fe822f

commit r11-9436-gad54d3fb8f09babc43ea46a93cc73cd623fe822f
Author: Jonathan Wakely <jwakely@redhat.com>
Date:   Tue Nov 30 13:14:38 2021 +0000

    libstdc++: Make Asan detection work for Clang [PR103453]
    
    Clang doesn't define __SANITIZE_ADDRESS__ so use its __has_feature check
    to detect Asan instead.
    
    libstdc++-v3/ChangeLog:
    
            PR libstdc++/103453
            * config/allocator/malloc_allocator_base.h
            (_GLIBCXX_SANITIZE_STD_ALLOCATOR): Define for Clang.
            * config/allocator/new_allocator_base.h
            (_GLIBCXX_SANITIZE_STD_ALLOCATOR): Likewise.
    
    (cherry picked from commit cca6090b13ab503bef1cfa327e2d107789d6bd30)

Diff:
---
 libstdc++-v3/config/allocator/malloc_allocator_base.h | 10 ++++++++--
 libstdc++-v3/config/allocator/new_allocator_base.h    | 10 ++++++++--
 2 files changed, 16 insertions(+), 4 deletions(-)

diff --git a/libstdc++-v3/config/allocator/malloc_allocator_base.h b/libstdc++-v3/config/allocator/malloc_allocator_base.h
index d7b56e3c9ef..b798d3fd448 100644
--- a/libstdc++-v3/config/allocator/malloc_allocator_base.h
+++ b/libstdc++-v3/config/allocator/malloc_allocator_base.h
@@ -52,8 +52,14 @@ namespace std
 # define __allocator_base  __gnu_cxx::malloc_allocator
 #endif
 
-#if defined(__SANITIZE_ADDRESS__) && !defined(_GLIBCXX_SANITIZE_STD_ALLOCATOR)
-# define _GLIBCXX_SANITIZE_STD_ALLOCATOR 1
+#ifndef _GLIBCXX_SANITIZE_STD_ALLOCATOR
+# if defined(__SANITIZE_ADDRESS__)
+#  define _GLIBCXX_SANITIZE_STD_ALLOCATOR 1
+# elif defined __has_feature
+#  if __has_feature(address_sanitizer)
+#   define _GLIBCXX_SANITIZE_STD_ALLOCATOR 1
+#  endif
+# endif
 #endif
 
 #endif
diff --git a/libstdc++-v3/config/allocator/new_allocator_base.h b/libstdc++-v3/config/allocator/new_allocator_base.h
index 77ee8b73979..7c52fef63de 100644
--- a/libstdc++-v3/config/allocator/new_allocator_base.h
+++ b/libstdc++-v3/config/allocator/new_allocator_base.h
@@ -52,8 +52,14 @@ namespace std
 # define __allocator_base  __gnu_cxx::new_allocator
 #endif
 
-#if defined(__SANITIZE_ADDRESS__) && !defined(_GLIBCXX_SANITIZE_STD_ALLOCATOR)
-# define _GLIBCXX_SANITIZE_STD_ALLOCATOR 1
+#ifndef _GLIBCXX_SANITIZE_STD_ALLOCATOR
+# if defined(__SANITIZE_ADDRESS__)
+#  define _GLIBCXX_SANITIZE_STD_ALLOCATOR 1
+# elif defined __has_feature
+#  if __has_feature(address_sanitizer)
+#   define _GLIBCXX_SANITIZE_STD_ALLOCATOR 1
+#  endif
+# endif
 #endif
 
 #endif