Skip to content

Commit 648b397

Browse files
build meta for torture run; fix base core in metagen
1 parent d288b51 commit 648b397

File tree

3 files changed

+8
-6
lines changed

3 files changed

+8
-6
lines changed

.github/workflows/builds.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,6 @@ jobs:
4747
shell: cmd
4848
run: |
4949
call "C:\Program Files\Microsoft Visual Studio\2022\Enterprise\VC\Auxiliary\Build\vcvarsall.bat" x64
50-
call build asan debug torture radlink radbin || exit /b 1
50+
call build asan debug meta torture radlink radbin || exit /b 1
5151
cd build
5252
torture || exit /b 1

src/base/base_core.h

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -370,8 +370,6 @@ CheckNil(nil,p) ? \
370370
# if defined(__SANITIZE_ADDRESS__)
371371
# define ASAN_ENABLED 1
372372
# define ASAN_NO_ADDR __declspec(no_sanitize_address)
373-
# else
374-
# define UBSAN_NO_ALIGN
375373
# endif
376374
#elif COMPILER_CLANG
377375
# if defined(__has_feature)

src/metagen/metagen_base/metagen_base_core.h

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,6 @@ CheckNil(nil,p) ? \
291291
# if defined(__SANITIZE_ADDRESS__)
292292
# define ASAN_ENABLED 1
293293
# define ASAN_NO_ADDR __declspec(no_sanitize_address)
294-
# else
295-
# define UBSAN_NO_ALIGN
296294
# endif
297295
#elif COMPILER_CLANG
298296
# if defined(__has_feature)
@@ -304,8 +302,14 @@ CheckNil(nil,p) ? \
304302
# define UBSAN_NO_ALIGN __attribute__((no_sanitize("alignment")))
305303
#endif
306304

305+
#ifndef ASAN_NO_ADDR
306+
# define ASAN_NO_ADDR
307+
#endif
308+
#ifndef UBSAN_NO_ALIGN
309+
# define UBSAN_NO_ALIGN
310+
#endif
311+
307312
#if ASAN_ENABLED
308-
#pragma comment(lib, "clang_rt.asan-x86_64.lib")
309313
C_LINKAGE void __asan_poison_memory_region(void const volatile *addr, size_t size);
310314
C_LINKAGE void __asan_unpoison_memory_region(void const volatile *addr, size_t size);
311315
# define AsanPoisonMemoryRegion(addr, size) __asan_poison_memory_region((addr), (size))

0 commit comments

Comments
 (0)