Annotate upperCase and lowerCase with @lazyinit.

This eliminates a TSAN warning. RELNOTES=n/a ------------- Created by MOE: https://github.com/google/moe MOE_MIGRATED_REVID=292973956
google · Feb 4, 2020 · c6f48dc · c6f48dc
1 parent d934850
commit c6f48dc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 4 deletions.
diff --git a/android/guava/src/com/google/common/io/BaseEncoding.java b/android/guava/src/com/google/common/io/BaseEncoding.java
@@ -28,6 +28,7 @@
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.base.Ascii;
 import com.google.common.base.Objects;
+import com.google.errorprone.annotations.concurrent.LazyInit;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -831,8 +832,8 @@ public BaseEncoding withSeparator(String separator, int afterEveryChars) {
       return new SeparatedBaseEncoding(this, separator, afterEveryChars);
     }
 
-    @MonotonicNonNullDecl private transient BaseEncoding upperCase;
-    @MonotonicNonNullDecl private transient BaseEncoding lowerCase;
+    @LazyInit @MonotonicNonNullDecl private transient BaseEncoding upperCase;
+    @LazyInit @MonotonicNonNullDecl private transient BaseEncoding lowerCase;
 
     @Override
     public BaseEncoding upperCase() {

diff --git a/guava/src/com/google/common/io/BaseEncoding.java b/guava/src/com/google/common/io/BaseEncoding.java
@@ -28,6 +28,7 @@
 import com.google.common.annotations.GwtIncompatible;
 import com.google.common.base.Ascii;
 import com.google.common.base.Objects;
+import com.google.errorprone.annotations.concurrent.LazyInit;
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.OutputStream;
@@ -831,8 +832,8 @@ public BaseEncoding withSeparator(String separator, int afterEveryChars) {
       return new SeparatedBaseEncoding(this, separator, afterEveryChars);
     }
 
-    private transient @MonotonicNonNull BaseEncoding upperCase;
-    private transient @MonotonicNonNull BaseEncoding lowerCase;
+    @LazyInit @MonotonicNonNull private transient BaseEncoding upperCase;
+    @LazyInit @MonotonicNonNull private transient BaseEncoding lowerCase;
 
     @Override
     public BaseEncoding upperCase() {