Merge "Enable errorprone check to ensure hashCode is implemented."

3 files changed, 16 insertions, 1 deletions

diff --git a/build.gradle b/build.gradle
index ef09f766e..e189e578d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -21,7 +21,8 @@ def errorProneConfiguration = [
     '-Xep:RemoveUnusedImports:WARN',
     '-Xep:MissingOverride:WARN',
     '-Xep:OvershadowingSubclassFields:WARN',
-    '-Xep:IntLongMath:WARN']
+    '-Xep:IntLongMath:WARN',
+    '-Xep:EqualsHashCode:WARN']
 
 apply from: 'copyAdditionalJctfCommonFiles.gradle'
 
diff --git a/src/main/java/com/android/tools/r8/bisect/BisectState.java b/src/main/java/com/android/tools/r8/bisect/BisectState.java
index b9359a303..f1810223f 100644
--- a/src/main/java/com/android/tools/r8/bisect/BisectState.java
+++ b/src/main/java/com/android/tools/r8/bisect/BisectState.java
@@ -104,6 +104,11 @@ public class BisectState {
       return start == o.start && end == o.end;
     }
 
+    @Override
+    public int hashCode() {
+      return 31 * start + end;
+    }
+
     private boolean verify() {
       return start <= end;
     }
diff --git a/src/main/java/com/android/tools/r8/ir/code/Position.java b/src/main/java/com/android/tools/r8/ir/code/Position.java
index a8312fbd4..08298bb15 100644
--- a/src/main/java/com/android/tools/r8/ir/code/Position.java
+++ b/src/main/java/com/android/tools/r8/ir/code/Position.java
@@ -4,6 +4,7 @@
 package com.android.tools.r8.ir.code;
 
 import com.android.tools.r8.graph.DexString;
+import java.util.Objects;
 
 public class Position {
 
@@ -53,6 +54,14 @@ public class Position {
   }
 
   @Override
+  public int hashCode() {
+    int result = line;
+    result = 31 * result + Objects.hashCode(file);
+    result = 31 * result + (synthetic ? 1 : 0);
+    return result;
+  }
+
+  @Override
   public String toString() {
     if (isNone()) {
       return "--";