aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
authorGravatar Vijay Pai <vpai@google.com>2017-03-16 23:47:16 -0700
committerGravatar GitHub <noreply@github.com>2017-03-16 23:47:16 -0700
commit5438888d3c6505c94dd3223c1dece087ee5829cc (patch)
tree98ac3506b33c7641294ac202c2996723b234ec80
parente0e809f9269585171665fe5d5a8e336fe0cf80df (diff)
parent30ddc63fdf668f37d9e5c104eb9def44170dc883 (diff)
Merge pull request #9806 from vjpai/increase_the_suppression
Suppress reporting of race caused by cached_size tracking in protobuf
-rw-r--r--tools/tsan_suppressions.txt4
1 files changed, 3 insertions, 1 deletions
diff --git a/tools/tsan_suppressions.txt b/tools/tsan_suppressions.txt
index 765fa098f9..e0c7907228 100644
--- a/tools/tsan_suppressions.txt
+++ b/tools/tsan_suppressions.txt
@@ -6,6 +6,8 @@ race:cleanse_ctr
race:ssleay_rand_add
race:ssleay_rand_bytes
race:__sleep_for
-# protobuf has an idempotent write race in ByteSize
+# protobuf has an idempotent write race in ByteSize/GetCachedSize
# https://github.com/google/protobuf/issues/2169
race:ByteSize
+race:ByteSizeLong
+race:GetCachedSize