metacall · viferga · Nov 21, 2024 · Nov 21, 2024 · Nov 22, 2024 · Nov 27, 2024
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -22,7 +22,7 @@
 #
 
 # CMake version
-cmake_minimum_required(VERSION 3.14 FATAL_ERROR)
+cmake_minimum_required(VERSION 3.15 FATAL_ERROR)
 
 # Include cmake modules
 
@@ -241,6 +241,9 @@ else()
 	endif()
 endif()
 
+# Export compile commands
+set(CMAKE_EXPORT_COMPILE_COMMANDS ON)
+
 #
 # CTest configuration
 #

diff --git a/cmake/CompileOptions.cmake b/cmake/CompileOptions.cmake
@@ -149,6 +149,39 @@ else()
 	set(SANITIZER_COMPILE_DEFINITIONS)
 endif()
 
+if("${CMAKE_C_COMPILER_ID}" STREQUAL "GNU" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "Clang" OR "${CMAKE_C_COMPILER_ID}" STREQUAL "AppleClang")
+	if(OPTION_BUILD_THREAD_SANITIZER)
+		execute_process(COMMAND ${CMAKE_C_COMPILER} -print-file-name=libtsan${CMAKE_SHARED_LIBRARY_SUFFIX} OUTPUT_VARIABLE LIBTSAN_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
+		set(SANITIZER_LIBRARIES_PATH
+			"${LIBTSAN_PATH}"
+		)
+	elseif(OPTION_BUILD_MEMORY_SANITIZER)
+		set(SANITIZER_LIBRARIES_PATH) # TODO
+	elseif(OPTION_BUILD_ADDRESS_SANITIZER)
+		execute_process(COMMAND ${CMAKE_C_COMPILER} -print-file-name=libasan${CMAKE_SHARED_LIBRARY_SUFFIX} OUTPUT_VARIABLE LIBASAN_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
+		execute_process(COMMAND ${CMAKE_C_COMPILER} -print-file-name=libubsan${CMAKE_SHARED_LIBRARY_SUFFIX} OUTPUT_VARIABLE LIBUBSAN_PATH OUTPUT_STRIP_TRAILING_WHITESPACE)
+		set(SANITIZER_LIBRARIES_PATH
+			"${LIBASAN_PATH}"
+			"${LIBUBSAN_PATH}"
+		)
+	endif()
+endif()
+
+if(SANITIZER_LIBRARIES_PATH)
+	if(PROJECT_OS_LINUX)
+		list(JOIN SANITIZER_LIBRARIES_PATH " " SANITIZER_LIBRARIES_PATH_JOINED)
+		set(TESTS_SANITIZER_PRELOAD_ENVIRONMENT_VARIABLES
+			"LD_PRELOAD=${SANITIZER_LIBRARIES_PATH_JOINED}"
+		)
+	elseif(PROJECT_OS_FAMILY MATCHES "macos")
+		list(JOIN SANITIZER_LIBRARIES_PATH ":" SANITIZER_LIBRARIES_PATH_JOINED)
+		set(TESTS_SANITIZER_PRELOAD_ENVIRONMENT_VARIABLES
+			"DYLD_INSERT_LIBRARIES=${SANITIZER_LIBRARIES_PATH_JOINED}"
+			"DYLD_FORCE_FLAT_NAMESPACE=1"
+		)
+	endif()
+endif()
+
 if((PROJECT_OS_WIN AND MSVC) OR "${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang")
 	# MSVC and Clang do not require to link manually the sanitizer libraries
 	set(SANITIZER_LIBRARIES)

diff --git a/source/adt/CMakeLists.txt b/source/adt/CMakeLists.txt
@@ -164,7 +164,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+add_link_options(${target}
 	PRIVATE
 
 	PUBLIC

diff --git a/source/benchmarks/log_bench/CMakeLists.txt b/source/benchmarks/log_bench/CMakeLists.txt
@@ -108,7 +108,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+add_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

diff --git a/source/benchmarks/metacall_cs_call_bench/CMakeLists.txt b/source/benchmarks/metacall_cs_call_bench/CMakeLists.txt
@@ -109,7 +109,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+add_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

diff --git a/source/benchmarks/metacall_cs_call_bench/source/metacall_cs_call_bench.cpp b/source/benchmarks/metacall_cs_call_bench/source/metacall_cs_call_bench.cpp
@@ -186,5 +186,7 @@ int main(int argc, char **argv)
 
 	::benchmark::RunSpecifiedBenchmarks();
 
-	return metacall_destroy();
+	metacall_destroy();
+
+	return 0;
 }
diff --git a/source/benchmarks/metacall_node_call_bench/CMakeLists.txt b/source/benchmarks/metacall_node_call_bench/CMakeLists.txt
@@ -109,7 +109,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+add_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

diff --git a/source/benchmarks/metacall_node_call_bench/source/metacall_node_call_bench.cpp b/source/benchmarks/metacall_node_call_bench/source/metacall_node_call_bench.cpp
@@ -292,5 +292,7 @@ int main(int argc, char **argv)
 	}
 #endif /* OPTION_BUILD_LOADERS_NODE */
 
-	return metacall_destroy();
+	metacall_destroy();
+
+	return 0;
 }
diff --git a/source/benchmarks/metacall_py_c_api_bench/CMakeLists.txt b/source/benchmarks/metacall_py_c_api_bench/CMakeLists.txt
@@ -121,7 +121,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+add_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

diff --git a/source/benchmarks/metacall_py_call_bench/CMakeLists.txt b/source/benchmarks/metacall_py_call_bench/CMakeLists.txt
@@ -109,7 +109,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+add_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

diff --git a/source/benchmarks/metacall_py_call_bench/source/metacall_py_call_bench.cpp b/source/benchmarks/metacall_py_call_bench/source/metacall_py_call_bench.cpp
@@ -178,10 +178,7 @@ int main(int argc, char *argv[])
 	::benchmark::RunSpecifiedBenchmarks();
 	::benchmark::Shutdown();
 
-	if (metacall_destroy() != 0)
-	{
-		return 4;
-	}
+	metacall_destroy();
 
 	return 0;
 }
diff --git a/source/benchmarks/metacall_py_init_bench/CMakeLists.txt b/source/benchmarks/metacall_py_init_bench/CMakeLists.txt
@@ -109,7 +109,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+add_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

diff --git a/source/benchmarks/metacall_py_init_bench/source/metacall_py_init_bench.cpp b/source/benchmarks/metacall_py_init_bench/source/metacall_py_init_bench.cpp
@@ -130,10 +130,7 @@ BENCHMARK_DEFINE_F(metacall_py_init_bench, destroy)
 /* Python */
 #if defined(OPTION_BUILD_LOADERS_PY)
 		{
-			if (metacall_destroy() != 0)
-			{
-				state.SkipWithError("Error destroying MetaCall");
-			}
+			metacall_destroy();
 		}
 #endif /* OPTION_BUILD_LOADERS_PY */
 	}

diff --git a/source/benchmarks/metacall_rb_call_bench/CMakeLists.txt b/source/benchmarks/metacall_rb_call_bench/CMakeLists.txt
@@ -109,7 +109,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+add_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

diff --git a/source/benchmarks/metacall_rb_call_bench/source/metacall_rb_call_bench.cpp b/source/benchmarks/metacall_rb_call_bench/source/metacall_rb_call_bench.cpp
@@ -198,10 +198,7 @@ int main(int argc, char *argv[])
 	::benchmark::RunSpecifiedBenchmarks();
 	::benchmark::Shutdown();
 
-	if (metacall_destroy() != 0)
-	{
-		return 4;
-	}
+	metacall_destroy();
 
 	return 0;
 }
diff --git a/source/cli/metacallcli/CMakeLists.txt b/source/cli/metacallcli/CMakeLists.txt
@@ -139,7 +139,7 @@ target_compile_features(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+add_link_options(${target}
 	PRIVATE
 	${DEFAULT_LINKER_OPTIONS}
 )

diff --git a/source/cli/metacallcli/source/application.cpp b/source/cli/metacallcli/source/application.cpp
@@ -299,12 +299,7 @@ application::application(int argc, char *argv[]) :
 
 application::~application()
 {
-	int result = metacall_destroy();
-
-	if (result != 0)
-	{
-		std::cout << "Error while destroying MetaCall, exit code: " << result << std::endl;
-	}
+	metacall_destroy();
 }
 
 void application::arguments_parse(std::vector<std::string> &arguments)

diff --git a/source/cli/plugins/cli_core_plugin/CMakeLists.txt b/source/cli/plugins/cli_core_plugin/CMakeLists.txt
@@ -180,7 +180,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+add_link_options(${target}
 	PRIVATE
 
 	PUBLIC

diff --git a/source/cli/plugins/cli_core_plugin/include/cli_core_plugin/cli_core_plugin.h b/source/cli/plugins/cli_core_plugin/include/cli_core_plugin/cli_core_plugin.h
@@ -23,16 +23,12 @@
 
 #include <cli_core_plugin/cli_core_plugin_api.h>
 
-#include <dynlink/dynlink.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 CLI_CORE_PLUGIN_API int cli_core_plugin(void *loader, void *handle);
 
-DYNLINK_SYMBOL_EXPORT(cli_core_plugin);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/source/cli/plugins/cli_sandbox_plugin/CMakeLists.txt b/source/cli/plugins/cli_sandbox_plugin/CMakeLists.txt
@@ -175,7 +175,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+add_link_options(${target}
 	PRIVATE
 
 	PUBLIC

diff --git a/source/cli/plugins/cli_sandbox_plugin/include/cli_sandbox_plugin/cli_sandbox_plugin.h b/source/cli/plugins/cli_sandbox_plugin/include/cli_sandbox_plugin/cli_sandbox_plugin.h
@@ -23,16 +23,12 @@
 
 #include <cli_sandbox_plugin/cli_sandbox_plugin_api.h>
 
-#include <dynlink/dynlink.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
 
 CLI_SANDBOX_PLUGIN_API int cli_sandbox_plugin(void *loader, void *handle);
 
-DYNLINK_SYMBOL_EXPORT(cli_sandbox_plugin);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/source/configuration/CMakeLists.txt b/source/configuration/CMakeLists.txt
@@ -164,7 +164,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+add_link_options(${target}
 	PRIVATE
 
 	PUBLIC
@@ -180,17 +180,19 @@ target_link_libraries(${target}
 function(configurations_write config_dir config_path)
 	set(CONFIGURATION_GLOBAL "{")
 
-	if(OPTION_BUILD_LOADERS)
-		set(CONFIGURATION_GLOBAL_LOADERS 0)
+	# TODO: Make this automatic for all loaders
 
+	if(OPTION_BUILD_LOADERS)
 		if(OPTION_BUILD_LOADERS_CS)
 			set(CONFIGURATION_GLOBAL "${CONFIGURATION_GLOBAL}\n\t\"cs_loader\":\"${config_dir}/cs_loader.json\",")
-			set(CONFIGURATION_GLOBAL_LOADERS 1)
+		endif()
+
+		if(OPTION_BUILD_LOADERS_NODE)
+			set(CONFIGURATION_GLOBAL "${CONFIGURATION_GLOBAL}\n\t\"node_loader\":\"${config_dir}/node_loader.json\",")
 		endif()
 
 		#if(OPTION_BUILD_LOADERS_JS)
 		#	set(CONFIGURATION_GLOBAL "${CONFIGURATION_GLOBAL}\n\t\"js_loader\":\"${config_dir}/js_loader.json\",")
-		#	set(CONFIGURATION_GLOBAL_LOADERS 1)
 		#endif()
 	endif()
 

diff --git a/source/detour/CMakeLists.txt b/source/detour/CMakeLists.txt
@@ -157,7 +157,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+add_link_options(${target}
 	PRIVATE
 
 	PUBLIC

diff --git a/source/detour/source/detour.c b/source/detour/source/detour.c
@@ -67,6 +67,11 @@ const char *detour_name(detour d)
 
 void (*detour_trampoline(detour_handle handle))(void)
 {
+	if (handle == NULL)
+	{
+		return NULL;
+	}
+
 	return handle->target;
 }
 

diff --git a/source/detours/funchook_detour/CMakeLists.txt b/source/detours/funchook_detour/CMakeLists.txt
@@ -221,7 +221,7 @@ target_compile_options(${target}
 # Linker options
 #
 
-target_link_libraries(${target}
+add_link_options(${target}
 	PRIVATE
 
 	PUBLIC

diff --git a/source/detours/funchook_detour/include/funchook_detour/funchook_detour.h b/source/detours/funchook_detour/include/funchook_detour/funchook_detour.h
@@ -27,8 +27,6 @@
 
 #include <detour/detour_interface.h>
 
-#include <dynlink/dynlink.h>
-
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -45,8 +43,6 @@ extern "C" {
 */
 FUNCHOOK_DETOUR_API detour_interface funchook_detour_impl_interface_singleton(void);
 
-DYNLINK_SYMBOL_EXPORT(funchook_detour_impl_interface_singleton);
-
 /**
 *  @brief
 *    Provide the module information
@@ -57,8 +53,6 @@ DYNLINK_SYMBOL_EXPORT(funchook_detour_impl_interface_singleton);
 */
 FUNCHOOK_DETOUR_API const char *funchook_detour_print_info(void);
 
-DYNLINK_SYMBOL_EXPORT(funchook_detour_print_info);
-
 #ifdef __cplusplus
 }
 #endif

diff --git a/source/detours/funchook_detour/scripts/download.bat.in b/source/detours/funchook_detour/scripts/download.bat.in
@@ -1,11 +1,11 @@
 @echo on
 
 rem Download repository if it does not exist
-if not exist @FUNCHOOK_SOURCE_DIR@/.git (
-	if exist @FUNCHOOK_SOURCE_DIR@ (
+if not exist "@FUNCHOOK_SOURCE_DIR@/.git" (
+	if exist "@FUNCHOOK_SOURCE_DIR@" (
 		rmdir /S /Q "@FUNCHOOK_SOURCE_DIR@"
 	)
-	"@GIT_EXECUTABLE@" clone --single-branch --branch v@FUNCHOOK_VERSION@ --recursive https://github.com/kubo/funchook.git @FUNCHOOK_SOURCE_DIR@
+	"@GIT_EXECUTABLE@" clone --single-branch --branch v@FUNCHOOK_VERSION@ --recursive https://github.com/kubo/funchook.git "@FUNCHOOK_SOURCE_DIR@"
 )
 
 rem Write empty CMake file to avoid cmake warnings

diff --git a/source/detours/funchook_detour/scripts/download.sh.in b/source/detours/funchook_detour/scripts/download.sh.in
@@ -1,11 +1,9 @@
 #!/usr/bin/env sh
 
 # Download repository if it does not exist
-if [ ! -d @FUNCHOOK_SOURCE_DIR@/.git ]
-then
-	if [ -d @FUNCHOOK_SOURCE_DIR@ ]
-	then
-		rm -rf @FUNCHOOK_SOURCE_DIR@
+if [ ! -d "@FUNCHOOK_SOURCE_DIR@/.git" ]; then
+	if [ -d "@FUNCHOOK_SOURCE_DIR@" ]; then
+		rm -rf "@FUNCHOOK_SOURCE_DIR@"
 	fi
-	@GIT_EXECUTABLE@ clone --single-branch --branch v@FUNCHOOK_VERSION@ --recursive https://github.com/kubo/funchook.git @FUNCHOOK_SOURCE_DIR@
+	"@GIT_EXECUTABLE@" clone --single-branch --branch v@FUNCHOOK_VERSION@ --recursive https://github.com/kubo/funchook.git "@FUNCHOOK_SOURCE_DIR@"
 fi
-Original file line number
+Diff line change
@@ Expand Up / @@ -164,7 +164,7 @@ target_compile_options(${target} @@
     # Linker options
     #
-    target_link_libraries(${target}
+    add_link_options(${target}
     	PRIVATE
     	PUBLIC
@@ Expand Down @@