Auto-detect ASan at compile time (#638)

Fixes: #636
quickjs-ng · Oct 29, 2024 · 56e5ffa · 56e5ffa
1 parent eae9b23
commit 56e5ffa
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -123,9 +123,6 @@ xoption(CONFIG_UBSAN "Enable UndefinedBehaviorSanitizer (UBSan)" OFF)
 
 if(CONFIG_ASAN)
 message(STATUS "Building with ASan")
-add_compile_definitions(
-    __ASAN__=1
-)
 add_compile_options(
     -fsanitize=address
     -fno-sanitize-recover=all
@@ -168,6 +165,7 @@ endif()
 
 if(CONFIG_UBSAN)
 message(STATUS "Building with UBSan")
+# __has_feature(undefined_sanitizer) or __SANITIZE_UNDEFINED__ don't exist
 add_compile_definitions(
     __UBSAN__=1
 )

diff --git a/cutils.h b/cutils.h
@@ -54,6 +54,14 @@ extern "C" {
 #include <pthread.h>
 #endif
 
+#if defined(__SANITIZE_ADDRESS__)
+# define __ASAN__ 1
+#elif defined(__has_feature)
+# if __has_feature(address_sanitizer)
+#  define __ASAN__ 1
+# endif
+#endif
+
 #if defined(_MSC_VER) && !defined(__clang__)
 #  define likely(x)       (x)
 #  define unlikely(x)     (x)