fix interning of ==

typetools · Feb 8, 2024 · f161f8f · f161f8f
1 parent 485cad2
commit f161f8f
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 9 deletions.
diff --git a/src/main/java/org/apache/bcel/classfile/Constant.java b/src/main/java/org/apache/bcel/classfile/Constant.java
@@ -37,7 +37,7 @@ public abstract class Constant implements Cloneable, Node {
 
         @Override
         public boolean equals(final Constant a, final Constant b) {
-            return a == b || a != null && b != null && Objects.equals(a.toString(), b.toString());
+            return a.equals(b) || a != null && b != null && Objects.equals(a.toString(), b.toString());
         }
 
         @Override

diff --git a/src/main/java/org/apache/bcel/classfile/Field.java b/src/main/java/org/apache/bcel/classfile/Field.java
@@ -47,7 +47,7 @@ public final class Field extends FieldOrMethod {
 
         @Override
         public boolean equals(final Field a, final Field b) {
-            return a == b || a != null && b != null && Objects.equals(a.getName(), b.getName()) && Objects.equals(a.getSignature(), b.getSignature());
+            return a.equals(b) || a != null && b != null && Objects.equals(a.getName(), b.getName()) && Objects.equals(a.getSignature(), b.getSignature());
         }
 
         @Override

diff --git a/src/main/java/org/apache/bcel/classfile/JavaClass.java b/src/main/java/org/apache/bcel/classfile/JavaClass.java
@@ -79,7 +79,7 @@ public class JavaClass extends AccessFlags implements Cloneable, Node, Comparabl
 
         @Override
         public boolean equals(final JavaClass a, final JavaClass b) {
-            return a == b || a != null && b != null && Objects.equals(a.getClassName(), b.getClassName());
+            return a.equals(b) || a != null && b != null && Objects.equals(a.getClassName(), b.getClassName());
         }
 
         @Override

diff --git a/src/main/java/org/apache/bcel/classfile/Method.java b/src/main/java/org/apache/bcel/classfile/Method.java
@@ -46,7 +46,7 @@ public final class Method extends FieldOrMethod {
 
         @Override
         public boolean equals(final Method a, final Method b) {
-            return a == b || a != null && b != null && Objects.equals(a.getName(), b.getName()) && Objects.equals(a.getSignature(), b.getSignature());
+            return a.equals(b) || a != null && b != null && Objects.equals(a.getName(), b.getName()) && Objects.equals(a.getSignature(), b.getSignature());
         }
 
         @Override

diff --git a/src/main/java/org/apache/bcel/generic/ClassGen.java b/src/main/java/org/apache/bcel/generic/ClassGen.java
@@ -55,7 +55,7 @@ public class ClassGen extends AccessFlags implements Cloneable {
 
         @Override
         public boolean equals(final ClassGen a, final ClassGen b) {
-            return a == b || a != null && b != null && Objects.equals(a.getClassName(), b.getClassName());
+            return a.equals(b) || a != null && b != null && Objects.equals(a.getClassName(), b.getClassName());
         }
 
         @Override

diff --git a/src/main/java/org/apache/bcel/generic/FieldGen.java b/src/main/java/org/apache/bcel/generic/FieldGen.java
@@ -50,7 +50,7 @@ public class FieldGen extends FieldGenOrMethodGen {
 
         @Override
         public boolean equals(final FieldGen a, final FieldGen b) {
-            return a == b || a != null && b != null && Objects.equals(a.getName(), b.getName()) && Objects.equals(a.getSignature(), b.getSignature());
+            return a.equals(b) || a != null && b != null && Objects.equals(a.getName(), b.getName()) && Objects.equals(a.getSignature(), b.getSignature());
         }
 
         @Override

diff --git a/src/main/java/org/apache/bcel/generic/MethodGen.java b/src/main/java/org/apache/bcel/generic/MethodGen.java
@@ -112,7 +112,7 @@ static final class BranchTarget {
 
         @Override
         public boolean equals(final FieldGenOrMethodGen a, final FieldGenOrMethodGen b) {
-            return a == b || a != null && b != null && Objects.equals(a.getName(), b.getName()) && Objects.equals(a.getSignature(), b.getSignature());
+            return a.equals(b) || a != null && b != null && Objects.equals(a.getName(), b.getName()) && Objects.equals(a.getSignature(), b.getSignature());
         }
 
         @Override

diff --git a/src/main/java/org/apache/bcel/generic/Select.java b/src/main/java/org/apache/bcel/generic/Select.java
@@ -324,7 +324,7 @@ public String toString(final boolean verbose) {
             for (int i = 0; i < match_length; i++) {
                 String s = "null";
                 if (targets[i] != null) {
-                    if (targets[i].getInstruction() == this) {
+                    if (targets[i].getInstruction().equals(this)) {
                         s = "<points to itself>";
                     } else {
                     s = targets[i].getInstruction().toString();

diff --git a/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java b/src/main/java/org/apache/bcel/verifier/structurals/InstConstraintVisitor.java
@@ -1777,7 +1777,7 @@ public void visitINVOKEVIRTUAL(final INVOKEVIRTUAL o) {
 
             final String theClass = o.getClassName(cpg);
 
-            if (objref != GENERIC_ARRAY && !Repository.instanceOf(objRefClassName, theClass)) {
+            if (!objref.equals(GENERIC_ARRAY) && !Repository.instanceOf(objRefClassName, theClass)) {
                 constraintViolated(o, "The 'objref' item '" + objref + "' does not implement '" + theClass + "' as expected.");
             }
         } catch (final ClassNotFoundException e) {