From 95ddf85f8075d5645a754bac5742b72ec9c81f2a Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Mon, 13 Nov 2017 10:04:29 -0800 Subject: Changes imported from Abseil "staging" branch: - 5677afe8f626bb9db6d8bf9f25ba3d835ffa12d6 Internal TSAN bookkeeping change. by Greg Falcon - c7492bad6fe6c8f106d3fcb1f8a939ea73b1a962 MSVC fix. by Alex Strelnikov GitOrigin-RevId: 5677afe8f626bb9db6d8bf9f25ba3d835ffa12d6 Change-Id: I1b8497508c8005a094824b4ccf9b220812b81bdb --- absl/base/internal/spinlock.cc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'absl/base/internal/spinlock.cc') diff --git a/absl/base/internal/spinlock.cc b/absl/base/internal/spinlock.cc index 517668dccc4c..3ac1f4dc96c3 100644 --- a/absl/base/internal/spinlock.cc +++ b/absl/base/internal/spinlock.cc @@ -91,12 +91,12 @@ static inline bool IsCooperative( // Uncommon constructors. SpinLock::SpinLock(base_internal::SchedulingMode mode) : lockword_(IsCooperative(mode) ? kSpinLockCooperative : 0) { - ABSL_TSAN_MUTEX_CREATE(this, 0); + ABSL_TSAN_MUTEX_CREATE(this, __tsan_mutex_not_static); } SpinLock::SpinLock(base_internal::LinkerInitialized, base_internal::SchedulingMode mode) { - ABSL_TSAN_MUTEX_CREATE(this, __tsan_mutex_linker_init); + ABSL_TSAN_MUTEX_CREATE(this, 0); if (IsCooperative(mode)) { InitLinkerInitializedAndCooperative(); } -- cgit 1.4.1