Clean up unnecessary "additional data" from memoizing deserialization. Since memoization is now a simple on-off switch, change semantics to have at most one memoizing frame: starting memoization is now an idempotent operation.

PiperOrigin-RevId: 189993914

1 files changed, 3 insertions, 11 deletions

diff --git a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/DeserializationContextTest.java b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/DeserializationContextTest.java
index b80f005467..31efc088b0 100644
--- a/src/test/java/com/google/devtools/build/lib/skyframe/serialization/DeserializationContextTest.java
+++ b/src/test/java/com/google/devtools/build/lib/skyframe/serialization/DeserializationContextTest.java
@@ -83,11 +83,7 @@ public class DeserializationContextTest {
     DeserializationContext deserializationContext =
         new DeserializationContext(registry, ImmutableMap.of());
     when(codedInputStream.readSInt32()).thenReturn(0);
-    assertThat(
-            (Object)
-                deserializationContext
-                    .newMemoizingContext(new Object())
-                    .deserialize(codedInputStream))
+    assertThat((Object) deserializationContext.getMemoizingContext().deserialize(codedInputStream))
         .isEqualTo(null);
     Mockito.verify(codedInputStream).readSInt32();
     Mockito.verifyZeroInteractions(registry);
@@ -102,11 +98,7 @@ public class DeserializationContextTest {
     DeserializationContext deserializationContext =
         new DeserializationContext(registry, ImmutableMap.of());
     when(codedInputStream.readSInt32()).thenReturn(1);
-    assertThat(
-            (Object)
-                deserializationContext
-                    .newMemoizingContext(new Object())
-                    .deserialize(codedInputStream))
+    assertThat((Object) deserializationContext.getMemoizingContext().deserialize(codedInputStream))
         .isEqualTo(constant);
     Mockito.verify(codedInputStream).readSInt32();
     Mockito.verify(registry).maybeGetConstantByTag(1);
@@ -127,7 +119,7 @@ public class DeserializationContextTest {
     when(registry.getCodecDescriptorByTag(1)).thenReturn(codecDescriptor);
     CodedInputStream codedInputStream = Mockito.mock(CodedInputStream.class);
     DeserializationContext deserializationContext =
-        new DeserializationContext(registry, ImmutableMap.of()).newMemoizingContext(new Object());
+        new DeserializationContext(registry, ImmutableMap.of()).getMemoizingContext();
     when(codec.deserialize(deserializationContext, codedInputStream)).thenReturn(returned);
     when(codedInputStream.readSInt32()).thenReturn(1);
     assertThat((Object) deserializationContext.deserialize(codedInputStream)).isEqualTo(returned);