Skip to content

Commit 1a82590

Browse files
committed
Move the ASAN options definition to the Julia executable.
1 parent 47c55db commit 1a82590

File tree

2 files changed

+10
-9
lines changed

2 files changed

+10
-9
lines changed

src/init.c

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -50,15 +50,6 @@ extern BOOL (WINAPI *hSymRefreshModuleList)(HANDLE);
5050
// list of modules being deserialized with __init__ methods
5151
jl_array_t *jl_module_init_order;
5252

53-
#ifdef JL_ASAN_ENABLED
54-
JL_DLLEXPORT const char* __asan_default_options() {
55-
return "allow_user_segv_handler=1:detect_leaks=0";
56-
// FIXME: enable LSAN after fixing leaks & defining __lsan_default_suppressions(),
57-
// or defining __lsan_default_options = exitcode=0 once publicly available
58-
// (here and in flisp/flmain.c)
59-
}
60-
#endif
61-
6253
size_t jl_page_size;
6354

6455
void jl_init_stack_limits(int ismaster, void **stack_lo, void **stack_hi)

ui/repl.c

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121

2222
#include "uv.h"
2323
#include "../src/julia.h"
24+
#include "../src/options.h"
2425
#include "../src/julia_assert.h"
2526

2627
JULIA_DEFINE_FAST_TLS()
@@ -29,6 +30,15 @@ JULIA_DEFINE_FAST_TLS()
2930
extern "C" {
3031
#endif
3132

33+
#ifdef JL_ASAN_ENABLED
34+
JL_DLLEXPORT const char* __asan_default_options() {
35+
return "allow_user_segv_handler=1:detect_leaks=0";
36+
// FIXME: enable LSAN after fixing leaks & defining __lsan_default_suppressions(),
37+
// or defining __lsan_default_options = exitcode=0 once publicly available
38+
// (here and in flisp/flmain.c)
39+
}
40+
#endif
41+
3242
static int exec_program(char *program)
3343
{
3444
JL_TRY {

0 commit comments

Comments
 (0)