diff --git a/.github/workflows/builds.yml b/.github/workflows/builds.yml index ccca9083..ba444da3 100644 --- a/.github/workflows/builds.yml +++ b/.github/workflows/builds.yml @@ -47,6 +47,6 @@ jobs: shell: cmd run: | call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64 - call build asan debug torture radlink radbin || exit /b 1 + call build asan debug meta torture radlink radbin || exit /b 1 cd build torture || exit /b 1 diff --git a/src/base/base_core.h b/src/base/base_core.h index 6cc94a5c..a644d1a7 100644 --- a/src/base/base_core.h +++ b/src/base/base_core.h @@ -370,8 +370,6 @@ CheckNil(nil,p) ? \ # if defined(__SANITIZE_ADDRESS__) # define ASAN_ENABLED 1 # define ASAN_NO_ADDR __declspec(no_sanitize_address) -# else -# define UBSAN_NO_ALIGN # endif #elif COMPILER_CLANG # if defined(__has_feature) diff --git a/src/metagen/metagen_base/metagen_base_core.h b/src/metagen/metagen_base/metagen_base_core.h index 4a5277bf..f76e2693 100644 --- a/src/metagen/metagen_base/metagen_base_core.h +++ b/src/metagen/metagen_base/metagen_base_core.h @@ -291,8 +291,6 @@ CheckNil(nil,p) ? \ # if defined(__SANITIZE_ADDRESS__) # define ASAN_ENABLED 1 # define ASAN_NO_ADDR __declspec(no_sanitize_address) -# else -# define UBSAN_NO_ALIGN # endif #elif COMPILER_CLANG # if defined(__has_feature) @@ -304,8 +302,14 @@ CheckNil(nil,p) ? \ # define UBSAN_NO_ALIGN __attribute__((no_sanitize("alignment"))) #endif +#ifndef ASAN_NO_ADDR +# define ASAN_NO_ADDR +#endif +#ifndef UBSAN_NO_ALIGN +# define UBSAN_NO_ALIGN +#endif + #if ASAN_ENABLED -#pragma comment(lib, "clang_rt.asan-x86_64.lib") C_LINKAGE void __asan_poison_memory_region(void const volatile *addr, size_t size); C_LINKAGE void __asan_unpoison_memory_region(void const volatile *addr, size_t size); # define AsanPoisonMemoryRegion(addr, size) __asan_poison_memory_region((addr), (size))