Add an IdentityHashMap to the BuildOptions.OptionsDiffForReconstruction codec.

PiperOrigin-RevId: 196310244

2 files changed, 9 insertions, 0 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DeserializationContext.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DeserializationContext.java
index 801dfc5149..45bde757b8 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DeserializationContext.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/DeserializationContext.java
@@ -120,4 +120,8 @@ public class DeserializationContext {
   public DeserializationContext getNewMemoizingContext() {
     return new DeserializationContext(this.registry, this.dependencies, new Deserializer());
   }
+
+  public DeserializationContext getNewNonMemoizingContext() {
+    return new DeserializationContext(this.registry, this.dependencies, null);
+  }
 }
diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContext.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContext.java
index 468a362e24..c16c6479e6 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContext.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/SerializationContext.java
@@ -131,6 +131,11 @@ public class SerializationContext {
         this.registry, this.dependencies, new Memoizer.Serializer(), allowFuturesToBlockWritingOn);
   }
 
+  public SerializationContext getNewNonMemoizingContext() {
+    return new SerializationContext(
+        this.registry, this.dependencies, null, this.allowFuturesToBlockWritingOn);
+  }
+
   /**
    * Register a {@link ListenableFuture} that must complete successfully before the serialized bytes
    * generated using this context can be written remotely. Failure of the future implies a bug or