From e11e039e02ef30a98a7928ce6c59cebe096dd753 Mon Sep 17 00:00:00 2001 From: Abseil Team Date: Wed, 1 Dec 2021 15:08:07 -0800 Subject: Export of internal Abseil changes -- 08d99ee216b7bfac1c5182db952d4e053e5ebc31 by Abseil Team : Fix race condition reported by tsan on `inline_element_size` in hashtablez. PiperOrigin-RevId: 413520771 GitOrigin-RevId: 08d99ee216b7bfac1c5182db952d4e053e5ebc31 Change-Id: Ibd396803f04a659cfbdb8dc7ec37511643657694 --- absl/container/sample_element_size_test.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'absl/container/sample_element_size_test.cc') diff --git a/absl/container/sample_element_size_test.cc b/absl/container/sample_element_size_test.cc index b23626b4..4bbef210 100644 --- a/absl/container/sample_element_size_test.cc +++ b/absl/container/sample_element_size_test.cc @@ -51,7 +51,8 @@ void TestInlineElementSize( size_t new_count = 0; sampler.Iterate([&](const HashtablezInfo& info) { if (preexisting_info.insert(&info).second) { - EXPECT_EQ(info.inline_element_size, expected_element_size); + EXPECT_EQ(info.inline_element_size.load(std::memory_order_relaxed), + expected_element_size); ++new_count; } }); -- cgit v1.2.3