@@ -277,37 +277,35 @@ function build_stage2 {
277
277
mkdir -p " ${SANITIZER_LOG_DIR} "
278
278
279
279
local log_path=" ${SANITIZER_LOG_DIR} /report"
280
+ local san_options=" log_path=${log_path} :log_exe_name=1:abort_on_error=1"
280
281
281
282
if [ " $sanitizer_name " == " msan" ]; then
282
283
export MSAN_SYMBOLIZER_PATH=" ${llvm_symbolizer_path} "
283
- export MSAN_OPTIONS=" abort_on_error=1"
284
- export MSAN_OPTIONS+=" :log_path=${log_path} :log_exe_name=1"
284
+ export MSAN_OPTIONS=" ${san_options} "
285
285
llvm_use_sanitizer=" Memory"
286
286
fsanitize_flag=" -fsanitize=memory"
287
287
elif [ " $sanitizer_name " == " msan_track_origins" ]; then
288
288
export MSAN_SYMBOLIZER_PATH=" ${llvm_symbolizer_path} "
289
- export MSAN_OPTIONS=" abort_on_error=1"
290
- export MSAN_OPTIONS+=" :log_path=${log_path} :log_exe_name=1"
289
+ export MSAN_OPTIONS=" ${san_options} "
291
290
llvm_use_sanitizer=" MemoryWithOrigins"
292
291
fsanitize_flag=" -fsanitize=memory -fsanitize-memory-track-origins"
293
292
elif [ " $sanitizer_name " == " asan" ]; then
294
293
export ASAN_SYMBOLIZER_PATH=" ${llvm_symbolizer_path} "
295
294
# TODO strict_init_order=true
296
295
export ASAN_OPTIONS=" check_initialization_order=true"
297
- export ASAN_OPTIONS+=" :log_path= ${log_path} :log_exe_name=1 "
296
+ export ASAN_OPTIONS+=" :${san_options} :abort_on_error=0 "
298
297
llvm_use_sanitizer=" Address"
299
298
fsanitize_flag=" -fsanitize=address"
300
299
elif [ " $sanitizer_name " == " hwasan" ]; then
301
300
export HWASAN_SYMBOLIZER_PATH=" ${llvm_symbolizer_path} "
302
- export HWASAN_OPTIONS=" abort_on_error=1"
303
- export HWASAN_OPTIONS+=" :log_path=${log_path} :log_exe_name=1"
301
+ export HWASAN_OPTIONS=" ${san_options} "
304
302
llvm_use_sanitizer=" HWAddress"
305
303
fsanitize_flag=" -fsanitize=hwaddress"
306
304
# FIXME: Support globals with DSO https://github.com/llvm/llvm-project/issues/57206
307
305
cmake_stage2_common_options+=" -DLLVM_ENABLE_PLUGINS=OFF"
308
306
elif [ " $sanitizer_name " == " ubsan" ]; then
309
307
export UBSAN_OPTIONS=" external_symbolizer_path=${llvm_symbolizer_path} :print_stacktrace=1"
310
- export UBSAN_OPTIONS+=" :log_path= ${log_path} :log_exe_name=1 "
308
+ export UBSAN_OPTIONS+=" :${san_options} :abort_on_error=0 "
311
309
llvm_use_sanitizer=" Undefined"
312
310
fsanitize_flag=" -fsanitize=undefined -fno-sanitize-recover=all"
313
311
# FIXME: After switching to LLVM_ENABLE_RUNTIMES, vptr has infitine
@@ -317,7 +315,7 @@ function build_stage2 {
317
315
# TODO strict_init_order=true
318
316
export ASAN_SYMBOLIZER_PATH=" ${llvm_symbolizer_path} "
319
317
export ASAN_OPTIONS=" check_initialization_order=true"
320
- export ASAN_OPTIONS+=" :log_path= ${log_path} :log_exe_name=1 "
318
+ export ASAN_OPTIONS+=" :${san_options} :abort_on_error=0 "
321
319
export UBSAN_OPTIONS=" print_stacktrace=1"
322
320
llvm_use_sanitizer=" Address;Undefined"
323
321
fsanitize_flag=" -fsanitize=address,undefined -fno-sanitize-recover=all"
0 commit comments