Automated rollback of commit 316cd7da6f6b003b853ccf7d144f395a9a557400.

*** Reason for rollback ***

Roll-forward with fix (equality and hashcode for relevant classes). Also add a bit more debugging info in case of failure.

PiperOrigin-RevId: 190492934

1 files changed, 21 insertions, 1 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkFileType.java b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkFileType.java
index 9fda709fa1..814d199000 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkFileType.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/skylark/SkylarkFileType.java
@@ -16,6 +16,7 @@ package com.google.devtools.build.lib.analysis.skylark;
 import com.google.common.annotations.VisibleForTesting;
 import com.google.common.collect.ImmutableList;
 import com.google.devtools.build.lib.actions.Artifact;
+import com.google.devtools.build.lib.skyframe.serialization.autocodec.AutoCodec;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkCallable;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModule;
 import com.google.devtools.build.lib.skylarkinterface.SkylarkModuleCategory;
@@ -33,11 +34,13 @@ import java.util.List;
       "Deprecated. File type for file filtering. Can be used to filter collections of labels "
           + "for certain file types."
 )
+@AutoCodec
 public class SkylarkFileType {
 
   private final FileType fileType;
 
-  private SkylarkFileType(FileType fileType) {
+  @AutoCodec.VisibleForSerialization
+  SkylarkFileType(FileType fileType) {
     this.fileType = fileType;
   }
 
@@ -69,4 +72,21 @@ public class SkylarkFileType {
   public Object getExtensions() {
     return fileType.getExtensions();
   }
+
+  @Override
+  public int hashCode() {
+    return fileType.hashCode();
+  }
+
+  @Override
+  public boolean equals(Object other) {
+    return other == this
+        || (other instanceof SkylarkFileType
+            && this.fileType.equals(((SkylarkFileType) other).fileType));
+  }
+
+  @Override
+  public String toString() {
+    return fileType.toString();
+  }
 }