1 files changed, 11 insertions, 0 deletions
diff --git a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
index 1bfba3a5d7..89360a765a 100644
--- a/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
+++ b/src/main/java/com/google/devtools/build/lib/syntax/Environment.java
@@ -230,6 +230,11 @@ public final class Environment implements Freezable {
     BaseExtension(Environment env) {
       this.bindings = ImmutableMap.copyOf(env.globalFrame.bindings);
     }
+
+    // Hack to allow serialization.
+    BaseExtension() {
+      this.bindings = ImmutableMap.of();
+    }
   }
 
   /**
@@ -249,6 +254,12 @@ public final class Environment implements Freezable {
       this.transitiveContentHashCode = env.getTransitiveContentHashCode();
     }
 
+    // Hack to allow serialization.
+    private Extension() {
+      super();
+      this.transitiveContentHashCode = null;
+    }
+
     @VisibleForTesting // This is only used in one test.
     public String getTransitiveContentHashCode() {
       return transitiveContentHashCode;