From 3c9e679a41f4173b6936e2b92248107dc691e248 Mon Sep 17 00:00:00 2001 From: cpovirk Date: Fri, 29 Apr 2022 09:02:20 -0700 Subject: [PATCH] Annotate a safe racy initialization with `@LazyInit`. This makes TSAN happy. Compare the other `@LazyInit` field in the class, added in cl/273585560 (and others in other classes). RELNOTES=n/a PiperOrigin-RevId: 445432352 --- android/guava/src/com/google/common/collect/HashBiMap.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/android/guava/src/com/google/common/collect/HashBiMap.java b/android/guava/src/com/google/common/collect/HashBiMap.java index 8639cb071057..de0f16d52241 100644 --- a/android/guava/src/com/google/common/collect/HashBiMap.java +++ b/android/guava/src/com/google/common/collect/HashBiMap.java @@ -749,7 +749,7 @@ public void clear() { } } - private transient Set keySet; + @LazyInit private transient Set keySet; @Override public Set keySet() { @@ -787,7 +787,7 @@ public boolean remove(@CheckForNull Object o) { } } - private transient Set valueSet; + @LazyInit private transient Set valueSet; @Override public Set values() { @@ -825,7 +825,7 @@ public boolean remove(@CheckForNull Object o) { } } - private transient Set> entrySet; + @LazyInit private transient Set> entrySet; @Override public Set> entrySet() {