Delete non-interning, non-singleton @AutoCodec.

PiperOrigin-RevId: 407710469
fweikert · Nov 5, 2021 · c2a9395 · c2a9395
1 parent 2dd6566
commit c2a9395
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 17 deletions.
diff --git a/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainVariables.java b/src/main/java/com/google/devtools/build/lib/rules/cpp/CcToolchainVariables.java
@@ -71,12 +71,9 @@ interface StringChunk {
 
   /** A plain text chunk of a string (containing no variables). */
   @Immutable
-  @AutoCodec
-  @VisibleForSerialization
-  static class StringLiteralChunk implements StringChunk, Serializable {
+  private static class StringLiteralChunk implements StringChunk {
     private final String text;
 
-    @VisibleForSerialization
     StringLiteralChunk(String text) {
       this.text = text;
     }

diff --git a/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java b/src/main/java/com/google/devtools/build/lib/rules/objc/J2ObjcAspect.java
@@ -80,6 +80,7 @@
 import com.google.devtools.build.lib.rules.proto.ProtoSourceFileExcludeList;
 import com.google.devtools.build.lib.skyframe.ConfiguredTargetAndData;
 import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
+import com.google.devtools.build.lib.skyframe.serialization.autocodec.SerializationConstant;
 import com.google.devtools.build.lib.util.FileType;
 import com.google.devtools.build.lib.vfs.PathFragment;
 import java.io.Serializable;
@@ -110,7 +111,7 @@ private static LabelLateBoundDefault<ProtoConfiguration> getProtoToolchainLabel(
 
   private static final String J2OBJC_PROTO_TOOLCHAIN_ATTR = ":j2objc_proto_toolchain";
 
-  @AutoCodec @AutoCodec.VisibleForSerialization
+  @SerializationConstant @AutoCodec.VisibleForSerialization
   static final LabelLateBoundDefault<?> DEAD_CODE_REPORT =
       LabelLateBoundDefault.fromTargetConfiguration(
           J2ObjcConfiguration.class,
@@ -689,7 +690,8 @@ private static List<? extends J2ObjcMappingFileProvider> getJ2ObjCMappings(RuleC
   }
 
   private static void addJ2ObjCMappingsForAttribute(
-      ImmutableList.Builder<J2ObjcMappingFileProvider> builder, RuleContext context,
+      ImmutableList.Builder<J2ObjcMappingFileProvider> builder,
+      RuleContext context,
       String attributeName) {
     if (context.attributes().has(attributeName, BuildType.LABEL_LIST)) {
       for (TransitiveInfoCollection dependencyInfoDatum : context.getPrerequisites(attributeName)) {
@@ -716,16 +718,14 @@ private static Artifact j2ObjcOutputArchiveSourceMappingFile(RuleContext ruleCon
   }
 
   private static Artifact j2ObjcSourceJarTranslatedSourceTreeArtifact(RuleContext ruleContext) {
-    PathFragment rootRelativePath = ruleContext
-        .getUniqueDirectory("_j2objc/src_jar_files")
-        .getRelative("source_files");
+    PathFragment rootRelativePath =
+        ruleContext.getUniqueDirectory("_j2objc/src_jar_files").getRelative("source_files");
     return ruleContext.getTreeArtifact(rootRelativePath, ruleContext.getBinOrGenfilesDirectory());
   }
 
   /**
-   * Returns a unique path fragment for j2objc headers. The slightly shorter path is
-   * useful for very large app builds, which otherwise may have command lines that are
-   * too long to be executable.
+   * Returns a unique path fragment for j2objc headers. The slightly shorter path is useful for very
+   * large app builds, which otherwise may have command lines that are too long to be executable.
    */
   private static String j2objcHeaderBase(RuleContext ruleContext) {
     boolean shorterPath =
@@ -750,9 +750,8 @@ private static J2ObjcSource javaJ2ObjcSource(
       ImmutableList<Artifact> javaSourceJarFiles) {
     PathFragment objcFileRootRelativePath =
         ruleContext.getUniqueDirectory(j2objcHeaderBase(ruleContext));
-    PathFragment objcFileRootExecPath = ruleContext
-        .getBinFragment()
-        .getRelative(objcFileRootRelativePath);
+    PathFragment objcFileRootExecPath =
+        ruleContext.getBinFragment().getRelative(objcFileRootRelativePath);
 
     // Note that these are mutable lists so that we can add the translated file info below.
     List<Artifact> objcSrcs =
@@ -817,8 +816,9 @@ private static List<Artifact> getOutputObjcFiles(
       String suffix) {
     List<Artifact> objcSources = new ArrayList<>();
     for (Artifact javaSrc : javaSrcs) {
-      objcSources.add(ruleContext.getRelatedArtifact(
-          objcFileRootRelativePath.getRelative(javaSrc.getExecPath()), suffix));
+      objcSources.add(
+          ruleContext.getRelatedArtifact(
+              objcFileRootRelativePath.getRelative(javaSrc.getExecPath()), suffix));
     }
     return objcSources;
   }