diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl.h b/compiler-rt/lib/tsan/rtl/tsan_rtl.h --- a/compiler-rt/lib/tsan/rtl/tsan_rtl.h +++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.h @@ -664,13 +664,9 @@ ALWAYS_INLINE void LazyInitialize(ThreadState *thr) { - // If we can use .preinit_array, assume that __tsan_init - // called from .preinit_array initializes runtime before - // any instrumented code. -#if !SANITIZER_CAN_USE_PREINIT_ARRAY + // Whether .preinit_array can be used, initialization check is always needed. if (UNLIKELY(!is_initialized)) Initialize(thr); -#endif } void TraceResetForTesting();