Improve a bit sanitizer support.

Author: viferga

cmake/CompileOptions.cmake

@@ -70,7 +70,7 @@ set(DEFAULT_INCLUDE_DIRECTORIES)
 
 # ThreadSanitizer is incompatible with AddressSanitizer and LeakSanitizer
 if(OPTION_BUILD_THREAD_SANITIZER AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
-	set(DEFAULT_LIBRARIES -ltsan)
+	set(SANITIZER_LIBRARIES -ltsan)
 	set(TESTS_SANITIZER_ENVIRONMENT_VARIABLES
 		"TSAN_OPTIONS=suppressions=${CMAKE_SOURCE_DIR}/source/tests/sanitizer/tsan.supp"
 	)
@@ -79,11 +79,20 @@ if(OPTION_BUILD_THREAD_SANITIZER AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE
 	)
 elseif(OPTION_BUILD_MEMORY_SANITIZER AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
 	# TODO: This requires much more effort than expected: https://github.com/google/sanitizers/wiki/MemorySanitizerLibcxxHowTo
-	set(DEFAULT_LIBRARIES)
+	set(SANITIZER_LIBRARIES)
 	set(TESTS_SANITIZER_ENVIRONMENT_VARIABLES)
-	set(SANITIZER_COMPILE_DEFINITIONS)
+	set(SANITIZER_COMPILE_DEFINITIONS
+		"__MEMORY_SANITIZER__=1"
+	)
+elseif(OPTION_BUILD_UB_SANITIZER AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+	# TODO
+	set(SANITIZER_LIBRARIES)
+	set(TESTS_SANITIZER_ENVIRONMENT_VARIABLES)
+	set(SANITIZER_COMPILE_DEFINITIONS
+		"__UB_SANITIZER__=1"
+	)
 elseif(OPTION_BUILD_SANITIZER AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
-	set(DEFAULT_LIBRARIES -lasan -lubsan)
+	set(SANITIZER_LIBRARIES -lasan -lubsan)
 	set(TESTS_SANITIZER_ENVIRONMENT_VARIABLES
 		"LSAN_OPTIONS=verbosity=1:log_threads=1:print_suppressions=false:suppressions=${CMAKE_SOURCE_DIR}/source/tests/sanitizer/lsan.supp"
 
@@ -100,11 +109,21 @@ elseif(OPTION_BUILD_SANITIZER AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BU
 		"__ADDRESS_SANITIZER__=1"
 	)
 else()
-	set(DEFAULT_LIBRARIES)
+	set(SANITIZER_LIBRARIES)
 	set(TESTS_SANITIZER_ENVIRONMENT_VARIABLES)
 	set(SANITIZER_COMPILE_DEFINITIONS)
 endif()
 
+if(WIN32 AND MSVC)
+	# MSVC does not require to link manually the sanitizer libraries
+	set(SANITIZER_LIBRARIES)
+endif()
+
+# Set default libraries
+set(DEFAULT_LIBRARIES
+	${SANITIZER_LIBRARIES}
+)
+
 #
 # Compile definitions
 #
@@ -220,6 +239,9 @@ if(WIN32 AND MSVC)
 		add_compile_options(/fsanitize=address)
 	elseif(OPTION_BUILD_MEMORY_SANITIZER AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
 		add_compile_options(/fsanitize=memory)
+		add_compile_options(/fsanitize=leak)
+	elseif(OPTION_BUILD_UB_SANITIZER AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+		add_compile_options(/fsanitize=undefined)
 	endif()
 endif()
 
@@ -275,6 +297,8 @@ if (PROJECT_OS_FAMILY MATCHES "unix")
 		add_compile_options(-fsanitize=memory)
 		add_compile_options(-fsanitize-memory-track-origins)
 		add_compile_options(-fsanitize-memory-use-after-dtor)
+	elseif(OPTION_BUILD_UB_SANITIZER AND "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang" AND (CMAKE_BUILD_TYPE STREQUAL "Debug" OR CMAKE_BUILD_TYPE STREQUAL "RelWithDebInfo"))
+		# TODO
 	endif()
 endif()
 

source/dynlink/source/dynlink_impl_beos.c

@@ -94,7 +94,7 @@ int dynlink_impl_interface_unload_beos(dynlink handle, dynlink_impl impl)
 {
 	(void)handle;
 
-#if defined(__ADDRESS_SANITIZER__) || defined(__THREAD_SANITIZER__)
+#if defined(__ADDRESS_SANITIZER__) || defined(__THREAD_SANITIZER__) || defined(__MEMORY_SANITIZER__)
 	/* Disable dlclose when running with address sanitizer in order to maintain stacktraces */
 	(void)impl;
 	return 0;

source/dynlink/source/dynlink_impl_unix.c

@@ -114,7 +114,7 @@ int dynlink_impl_interface_unload_unix(dynlink handle, dynlink_impl impl)
 {
 	(void)handle;
 
-#if defined(__ADDRESS_SANITIZER__) || defined(__THREAD_SANITIZER__)
+#if defined(__ADDRESS_SANITIZER__) || defined(__THREAD_SANITIZER__) || defined(__MEMORY_SANITIZER__) || defined(__UB_SANITIZER__)
 	/* Disable dlclose when running with address sanitizer in order to maintain stacktraces */
 	(void)impl;
 	return 0;

source/ports/js_port/test/main.cpp

@@ -323,7 +323,7 @@ void ModulesClear()
 		FreeLibrary(it->second);
 #elif defined(JS_PORT_TEST_UNIX)
 	/* Disable dlclose when running with address sanitizer in order to maintain stacktraces */
-	#if !defined(__ADDRESS_SANITIZER__) && !defined(__THREAD_SANITIZER__)
+	#if !defined(__ADDRESS_SANITIZER__) && !defined(__THREAD_SANITIZER__) && !defined(__MEMORY_SANITIZER__) && !defined(__UB_SANITIZER__)
 		dlclose(it->second);
 	#endif
 #endif

source/tests/metacall_test/source/metacall_test.cpp

@@ -280,7 +280,7 @@ TEST_F(metacall_test, DefaultConstructor)
 
 		metacall_value_destroy(ret);
 
-	#if !defined(__ADDRESS_SANITIZER__) && !defined(__THREAD_SANITIZER__) && !defined(__MEMORY_SANITIZER__)
+	#if !defined(__ADDRESS_SANITIZER__) && !defined(__THREAD_SANITIZER__) && !defined(__MEMORY_SANITIZER__) && !defined(__UB_SANITIZER__)
 		/* Testing corrupted value input */
 		struct
 		{