1 files changed, 5 insertions, 0 deletions
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 bb5a50492c..60df5c8140 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
@@ -43,6 +43,11 @@ public class SerializationContext {
       codedOut.writeSInt32NoTag(0);
       return;
     }
+    Integer tag = registry.maybeGetTagForConstant(object);
+    if (tag != null) {
+      codedOut.writeSInt32NoTag(tag);
+      return;
+    }
     ObjectCodecRegistry.CodecDescriptor descriptor = registry.getCodecDescriptor(object.getClass());
     codedOut.writeSInt32NoTag(descriptor.getTag());
     descriptor.serialize(this, object, codedOut);