Guard no_sanitize attribute more carefully.

bfgroup · Jan 13, 2024 · 8e18c33 · 8e18c33
1 parent 8db2305
commit 8e18c33
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/src/engine/function.cpp b/src/engine/function.cpp
@@ -286,10 +286,12 @@ struct _stack
         data = end;
     }
 
-    #ifdef __clang__
+    #if defined(__clang__) && defined(__has_feature)
+    #if __has_feature(address_sanitizer)
     // This function calls not properly type-erased callbacks
     __attribute__((no_sanitize("undefined")))
     #endif
+    #endif
     void done()
     {
         if ( cleanups_size > cleanups_t::size_type(0) )

diff --git a/src/engine/hash.cpp b/src/engine/hash.cpp
@@ -274,10 +274,12 @@ static void hashrehash( struct hash * hp )
 }
 
 
-#ifdef __clang__
+#if defined(__clang__) && defined(__has_feature)
+#if __has_feature(address_sanitizer)
 // This function calls not properly type-erased callbacks
 __attribute__((no_sanitize("undefined")))
 #endif
+#endif
 void hashenumerate( struct hash * hp, void (* f)( void *, void * ), void * data
     )
 {