@@ -580,22 +580,15 @@ function main(): void
580580 $ environment'USE_TRACKED_ALLOC ' ] = 1 ;
581581 $ environment'SKIP_ASAN ' ] = 1 ;
582582 $ environment'SKIP_PERF_SENSITIVE ' ] = 1 ;
583- $ lsan_options
584583 if ($ switch'--msan ' ) {
585584 $ environment'SKIP_MSAN ' ] = 1 ;
586- // use_tls=0 is a workaround for MSAN crashing with "Tracer caught signal 11" (SIGSEGV),
587- // which seems to be an issue with TLS support in newer glibc versions under virtualized
588- // environments. Follow https://github.com/google/sanitizers/issues/1342 and
589- // https://github.com/google/sanitizers/issues/1409 to track this issue.
590- $ lsan_options'use_tls=0 ' ;
585+ $ environment'MSAN_OPTIONS ' ] = 'intercept_tls_get_addr=0 ' ;
591586 }
587+ 592588 $ lsanSuppressions__DIR__ . '/.github/lsan-suppressions.txt ' ;
593589 if (file_exists ($ lsanSuppressions
594- $ lsan_options'suppressions= ' . $ lsanSuppressions
595- $ lsan_options'print_suppressions=0 ' ;
596- }
597- if (!empty ($ lsan_options
598- $ environment'LSAN_OPTIONS ' ] = join (': ' , $ lsan_options
590+ $ environment'LSAN_OPTIONS ' ] = 'suppressions= ' . $ lsanSuppressions
591+ . ':print_suppressions=0 ' ;
599592 }
600593 break ;
601594 case '--repeat ' :
0 commit comments