fix: make equals impl in Record classes as "usual"

spotbugs · Apr 12, 2021 · a96eba9 · a96eba9
1 parent 0814217
commit a96eba9
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git a/spotbugs/src/main/java/edu/umd/cs/findbugs/ba/EqualsKindSummary.java b/spotbugs/src/main/java/edu/umd/cs/findbugs/ba/EqualsKindSummary.java
@@ -34,7 +34,7 @@ public class EqualsKindSummary {
     public static enum KindOfEquals {
         OBJECT_EQUALS, ABSTRACT_INSTANCE_OF, INSTANCE_OF_EQUALS, INSTANCE_OF_SUPERCLASS_EQUALS, COMPARE_EQUALS, CHECKED_CAST_EQUALS, RETURNS_SUPER,
         GETCLASS_GOOD_EQUALS, ABSTRACT_GETCLASS_GOOD_EQUALS, GETCLASS_BAD_EQUALS, DELEGATE_EQUALS, TRIVIAL_EQUALS, INVOKES_SUPER, ALWAYS_TRUE,
-        ALWAYS_FALSE, UNKNOWN
+        ALWAYS_FALSE, UNKNOWN, RECORD
     }
 
     public EqualsKindSummary.KindOfEquals get(ClassAnnotation c) {

diff --git a/spotbugs/src/main/java/edu/umd/cs/findbugs/detect/OverridingEqualsNotSymmetrical.java b/spotbugs/src/main/java/edu/umd/cs/findbugs/detect/OverridingEqualsNotSymmetrical.java
@@ -83,7 +83,7 @@ public void visit(Code obj) {
                 && EQUALS_SIGNATURE.equals(getMethodSig())) {
             sawCheckedCast = sawSuperEquals = sawInstanceOf = sawGetClass = sawReturnSuper = sawCompare = sawReturnNonSuper = prevWasSuperEquals =
                     sawGoodEqualsClass = sawBadEqualsClass = dangerDanger = sawInstanceOfSupertype = alwaysTrue = alwaysFalse = sawStaticDelegate =
-                            sawEqualsBuilder = false;
+                            sawEqualsBuilder = isRecord = false;
             sawInitialIdentityCheck = obj.getCode().length == 11 || obj.getCode().length == 9;
             equalsCalls = 0;
             super.visit(obj);
@@ -114,6 +114,8 @@ public void visit(Code obj) {
                 kind = EqualsKindSummary.KindOfEquals.CHECKED_CAST_EQUALS;
             } else if (sawCompare) {
                 kind = EqualsKindSummary.KindOfEquals.COMPARE_EQUALS;
+            } else if (isRecord) {
+                kind = EqualsKindSummary.KindOfEquals.RECORD;
             } else {
                 if (AnalysisContext.currentAnalysisContext().isApplicationClass(getThisClass())) {
                     bugReporter
@@ -194,6 +196,8 @@ public void visit(Code obj) {
 
     boolean sawEqualsBuilder;
 
+    boolean isRecord;
+
     private final EnumMap<EqualsKindSummary.KindOfEquals, Integer> count = new EnumMap<>(
             EqualsKindSummary.KindOfEquals.class);
 
@@ -322,7 +326,9 @@ && getPrevOpcode(2) == Const.ALOAD_0)) {
                 && "()Ljava/lang/Class;".equals(getSigConstantOperand())) {
             sawGetClass = true;
         }
-
+        if (seen == Const.INVOKEDYNAMIC && "java/lang/Record".equals(getSuperclassName())) {
+            isRecord = true;
+        }
     }
 
     private boolean callToInvoke(int seen) {