Automated rollback of commit db01c6f926bcb4774d901797c59f51dd54c05624.

*** Reason for rollback ***

Rolling forward with fixes.

*** Original change description ***

PiperOrigin-RevId: 206339696

2 files changed, 23 insertions, 8 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
index baa2940b1c..3b280c5b25 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildConfigurationTest.java
@@ -462,9 +462,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
     // Unnecessary ImmutableList.copyOf apparently necessary to choose non-varargs constructor.
     new SerializationTester(ImmutableList.copyOf(getTestConfigurations()))
         .addDependency(FileSystem.class, getScratch().getFileSystem())
-        .addDependency(
-            BuildConfigurationValue.KeyCodecCache.class,
-            new BuildConfigurationValue.KeyCodecCache())
+        .addDependency(BuildOptions.OptionsDiffCache.class, new BuildOptions.DiffToByteCache())
         .setVerificationFunction(BuildConfigurationTest::verifyDeserialized)
         .runTests();
   }
@@ -476,9 +474,7 @@ public class BuildConfigurationTest extends ConfigurationTestCase {
                 .stream()
                 .map(BuildConfigurationValue::key)
                 .collect(ImmutableList.toImmutableList()))
-        .addDependency(
-            BuildConfigurationValue.KeyCodecCache.class,
-            new BuildConfigurationValue.KeyCodecCache())
+        .addDependency(BuildOptions.OptionsDiffCache.class, new BuildOptions.DiffToByteCache())
         .runTests();
   }
 
diff --git a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildOptionsTest.java b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildOptionsTest.java
index 3f0f93a513..099ded0337 100644
--- a/src/test/java/com/google/devtools/build/lib/analysis/config/BuildOptionsTest.java
+++ b/src/test/java/com/google/devtools/build/lib/analysis/config/BuildOptionsTest.java
@@ -210,7 +210,26 @@ public class BuildOptionsTest {
     OptionsDiffForReconstruction diff1 = BuildOptions.diffForReconstruction(one, two);
     OptionsDiffForReconstruction diff2 = BuildOptions.diffForReconstruction(one, two);
     assertThat(diff2).isEqualTo(diff1);
-    assertThat(TestUtils.toBytes(diff2, ImmutableMap.of()))
-        .isEqualTo(TestUtils.toBytes(diff1, ImmutableMap.of()));
+    assertThat(
+            TestUtils.toBytes(
+                diff2,
+                ImmutableMap.of(
+                    BuildOptions.OptionsDiffCache.class, new BuildOptions.DiffToByteCache())))
+        .isEqualTo(
+            TestUtils.toBytes(
+                diff1,
+                ImmutableMap.of(
+                    BuildOptions.OptionsDiffCache.class, new BuildOptions.DiffToByteCache())));
+  }
+
+  @Test
+  public void repeatedCodec() throws Exception {
+    BuildOptions one = BuildOptions.of(TEST_OPTIONS, "--compilation_mode=opt", "cpu=k8");
+    BuildOptions two = BuildOptions.of(TEST_OPTIONS, "--compilation_mode=dbg", "cpu=k8");
+    OptionsDiffForReconstruction diff = BuildOptions.diffForReconstruction(one, two);
+    BuildOptions.OptionsDiffCache cache = new BuildOptions.FingerprintingKDiffToByteStringCache();
+    assertThat(TestUtils.toBytes(diff, ImmutableMap.of(BuildOptions.OptionsDiffCache.class, cache)))
+        .isEqualTo(
+            TestUtils.toBytes(diff, ImmutableMap.of(BuildOptions.OptionsDiffCache.class, cache)));
   }
 }