Make some objects frequently encountered during serialization into constants. A lot of care is needed here because we're using reference equality. I plan to add value-equality constants in a follow-up.

Add ImmutableSortedSet marshaller because I think it might have been needed, and hey, why not.

PiperOrigin-RevId: 192326359

1 files changed, 8 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/AutoRegistry.java b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/AutoRegistry.java
index bae7acca31..7785493aa5 100644
--- a/src/main/java/com/google/devtools/build/lib/skyframe/serialization/AutoRegistry.java
+++ b/src/main/java/com/google/devtools/build/lib/skyframe/serialization/AutoRegistry.java
@@ -18,7 +18,10 @@ import com.google.common.base.Predicates;
 import com.google.common.base.Supplier;
 import com.google.common.base.Suppliers;
 import com.google.common.collect.ImmutableList;
+import com.google.common.collect.ImmutableSet;
+import com.google.common.collect.Ordering;
 import java.io.IOException;
+import java.util.Comparator;
 
 /**
  * A lazy, automatically populated registry.
@@ -48,7 +51,11 @@ public class AutoRegistry {
           Predicates.alwaysTrue(),
           Predicates.alwaysFalse(),
           Predicates.isNull(),
-          Predicates.notNull());
+          Predicates.notNull(),
+          ImmutableList.of(),
+          ImmutableSet.of(),
+          Comparator.naturalOrder(),
+          Ordering.natural());
 
   public static ObjectCodecRegistry get() {
     return SUPPLIER.get();