Deletes POLYMORPHIC strategy. ObjectCodec now uses runtime type information to select a codec.

PiperOrigin-RevId: 186378153

4 files changed, 4 insertions, 17 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
index 3f2a463c43..3bec3daa6b 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildConfiguration.java
@@ -139,10 +139,7 @@ public class BuildConfiguration implements BuildConfigurationInterface {
    * declare {@link ImmutableList} signatures on their interfaces vs. {@link List}). This is because
    * fragment instances may be shared across configurations.
    */
-  @AutoCodec(strategy = AutoCodec.Strategy.POLYMORPHIC)
   public abstract static class Fragment {
-    public static final ObjectCodec<Fragment> CODEC = new BuildConfiguration_Fragment_AutoCodec();
-
     /**
      * Validates the options for this Fragment. Issues warnings for the
      * use of deprecated options, and warnings or errors for any option settings
@@ -2146,7 +2143,7 @@ public class BuildConfiguration implements BuildConfigurationInterface {
       BlazeDirectories.CODEC.serialize(context, obj.directories, codedOut);
       codedOut.writeInt32NoTag(obj.fragments.size());
       for (Fragment fragment : obj.fragments.values()) {
-        Fragment.CODEC.serialize(context, fragment, codedOut);
+        context.serialize(fragment, codedOut);
       }
       BuildOptions.CODEC.serialize(context, obj.buildOptions, codedOut);
       StringCodecs.asciiOptimized().serialize(context, obj.repositoryName, codedOut);
@@ -2160,7 +2157,7 @@ public class BuildConfiguration implements BuildConfigurationInterface {
       ImmutableSortedMap.Builder<Class<? extends Fragment>, Fragment> builder =
           new ImmutableSortedMap.Builder<>(lexicalFragmentSorter);
       for (int i = 0; i < length; ++i) {
-        Fragment fragment = Fragment.CODEC.deserialize(context, codedIn);
+        Fragment fragment = context.deserialize(codedIn);
         builder.put(fragment.getClass(), fragment);
       }
       BuildOptions options = BuildOptions.CODEC.deserialize(context, codedIn);
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
index 4a89121dd5..cd1db7c261 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
@@ -345,7 +345,7 @@ public final class BuildOptions implements Cloneable, Serializable {
       Collection<FragmentOptions> fragmentOptions = buildOptions.getOptions();
       codedOut.writeInt32NoTag(fragmentOptions.size());
       for (FragmentOptions options : buildOptions.getOptions()) {
-        FragmentOptions.CODEC.serialize(context, options, codedOut);
+        context.serialize(options, codedOut);
       }
     }
 
@@ -355,7 +355,7 @@ public final class BuildOptions implements Cloneable, Serializable {
       BuildOptions.Builder builder = BuildOptions.builder();
       int length = codedIn.readInt32();
       for (int i = 0; i < length; ++i) {
-        builder.add(FragmentOptions.CODEC.deserialize(context, codedIn));
+        builder.add(context.deserialize(codedIn));
       }
       return builder.build();
     }
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java
index 305a95ef23..abf15c5081 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/FragmentOptions.java
@@ -17,8 +17,6 @@ package com.google.devtools.build.lib.analysis.config;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.ImmutableMap;
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
-import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.common.options.Options;
 import com.google.devtools.common.options.OptionsBase;
 import java.io.Serializable;
@@ -26,10 +24,7 @@ import java.util.Map;
 import java.util.Set;
 
 /** Command-line build options for a Blaze module. */
-@AutoCodec(strategy = AutoCodec.Strategy.POLYMORPHIC)
 public abstract class FragmentOptions extends OptionsBase implements Cloneable, Serializable {
-  public static final ObjectCodec<FragmentOptions> CODEC = new FragmentOptions_AutoCodec();
-
   /**
    * Returns the labels contributed to the defaults package by this fragment.
    *
diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnder.java b/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnder.java
index 349c62b910..5848f5b9e9 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnder.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/RunUnder.java
@@ -14,16 +14,11 @@
 package com.google.devtools.build.lib.analysis.config;
 
 import com.google.devtools.build.lib.cmdline.Label;
-import com.google.devtools.build.lib.skyframe.serialization.ObjectCodec;
-import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import java.io.Serializable;
 import java.util.List;
 
 /** Components of --run_under option. */
-@AutoCodec(strategy = AutoCodec.Strategy.POLYMORPHIC)
 public interface RunUnder extends Serializable {
-  public static final ObjectCodec<RunUnder> CODEC = new RunUnder_AutoCodec();
-
   /**
    * @return the whole value passed to --run_under option.
    */