Only use fingerprint and checksum for equality and hashCode in BuildOptions$OptionsDiffForReconstruction. The fingerprint uniquely identifies the "baseline" BuildOptions object and the checksum uniquely identifies the "overlay", so we don't need to incorporate the rest of the data.

PiperOrigin-RevId: 196532013

1 files changed, 2 insertions, 10 deletions

diff --git a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
index 87ed80b888..87c4244a13 100644
--- a/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
+++ b/src/main/java/com/google/devtools/build/lib/analysis/config/BuildOptions.java
@@ -618,10 +618,7 @@ public final class BuildOptions implements Cloneable, Serializable {
         return false;
       }
       OptionsDiffForReconstruction that = (OptionsDiffForReconstruction) o;
-      return differingOptions.equals(that.differingOptions)
-          && extraFirstFragmentClasses.equals(that.extraFirstFragmentClasses)
-          && this.extraSecondFragments.equals(that.extraSecondFragments)
-          && Arrays.equals(this.baseFingerprint, that.baseFingerprint)
+      return Arrays.equals(this.baseFingerprint, that.baseFingerprint)
           && this.checksum.equals(that.checksum);
     }
 
@@ -635,12 +632,7 @@ public final class BuildOptions implements Cloneable, Serializable {
 
     @Override
     public int hashCode() {
-      return Objects.hash(
-          differingOptions,
-          extraFirstFragmentClasses,
-          extraSecondFragments,
-          Arrays.hashCode(baseFingerprint),
-          checksum);
+      return 31 * Arrays.hashCode(baseFingerprint) + checksum.hashCode();
     }
   }