Allow @AutoCodec to tag static final fields, and generate a "pointer" class that has a single static INSTANCE field pointing back to the target field, so that serialization can grab it.

PiperOrigin-RevId: 187065629

1 files changed, 4 insertions, 1 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 5377d4ffc6..e867969cdf 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
@@ -43,7 +43,10 @@ public class DeserializationContext {
     if (tag == 0) {
       return null;
     }
-    return (T) registry.getCodecDescriptorByTag(tag).deserialize(this, codedIn);
+    T constant = (T) registry.maybeGetConstantByTag(tag);
+    return constant == null
+        ? (T) registry.getCodecDescriptorByTag(tag).deserialize(this, codedIn)
+        : constant;
   }
 
   @SuppressWarnings("unchecked")