From a03a4accd8c45c69fb879fa97ba78a0ec7131e64 Mon Sep 17 00:00:00 2001
From: sjfink <sjfink@f5eafffb-2e1d-0410-98e4-8ec43c5233c4>
Date: Thu, 3 May 2007 17:26:31 +0000
Subject: [PATCH] make SSAInstruction.equals() consistently use ==

git-svn-id: https://wala.svn.sourceforge.net/svnroot/wala/trunk@1047 f5eafffb-2e1d-0410-98e4-8ec43c5233c4
---
 .../wala/ssa/SSAConditionalBranchInstruction.java |  9 ---------
 .../src/com/ibm/wala/ssa/SSAGetInstruction.java   |  2 +-
 .../src/com/ibm/wala/ssa/SSAInstruction.java      |  2 +-
 .../com/ibm/wala/ssa/SSAInvokeInstruction.java    | 15 ---------------
 .../src/com/ibm/wala/ssa/SSANewInstruction.java   | 15 ---------------
 5 files changed, 2 insertions(+), 41 deletions(-)

diff --git a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAConditionalBranchInstruction.java b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAConditionalBranchInstruction.java
index 47af247b4..45120c83b 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAConditionalBranchInstruction.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAConditionalBranchInstruction.java
@@ -70,15 +70,6 @@ public class SSAConditionalBranchInstruction extends SSAInstruction {
     return 2;
   }
 
-  /*
-   * (non-Javadoc)
-   * 
-   * @see java.lang.Object#equals(java.lang.Object)
-   */
-  public boolean equals(Object obj) {
-    return this == obj;
-  }
-
   /**
    * @see com.ibm.wala.ssa.SSAInstruction#getUse(int)
    */
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGetInstruction.java b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGetInstruction.java
index 80c7ecbf2..76a97e4ff 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGetInstruction.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAGetInstruction.java
@@ -96,7 +96,7 @@ public class SSAGetInstruction extends SSAFieldAccessInstruction {
   }
 
   public int hashCode() {
-    return result * 2371 ^ 6521;
+    return result * 2371 + 6521;
   }
 
   /*
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstruction.java b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstruction.java
index b898a778a..287b68b0c 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstruction.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInstruction.java
@@ -257,7 +257,7 @@ public abstract class SSAInstruction implements IInstruction {
    * 
    * @see java.lang.Object#equals(java.lang.Object)
    */
-  public boolean equals(Object obj) {
+  public final boolean equals(Object obj) {
     return this == obj;
   }
 }
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInvokeInstruction.java b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInvokeInstruction.java
index 686f3b608..504ff66d3 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInvokeInstruction.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSAInvokeInstruction.java
@@ -134,19 +134,4 @@ public class SSAInvokeInstruction extends SSAAbstractInvokeInstruction {
   public Collection<TypeReference> getExceptionTypes() {
     return Exceptions.getNullPointerException();
   }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see java.lang.Object#equals(java.lang.Object)
-   */
-  public boolean equals(Object obj) {
-    if (obj instanceof SSAInvokeInstruction) {
-      SSAInvokeInstruction other = (SSAInvokeInstruction) obj;
-      return site.equals(other.site) && result == other.result;
-    } else {
-      return false;
-    }
-  }
-
 }
diff --git a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSANewInstruction.java b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSANewInstruction.java
index e72f7d42c..09e41c2cd 100644
--- a/com.ibm.wala.core/src/com/ibm/wala/ssa/SSANewInstruction.java
+++ b/com.ibm.wala.core/src/com/ibm/wala/ssa/SSANewInstruction.java
@@ -158,19 +158,4 @@ public class SSANewInstruction extends SSAInstruction {
   public Collection<TypeReference> getExceptionTypes() {
     return site.getDeclaredType().isArrayType() ? Exceptions.getNewArrayExceptions() : Exceptions.getNewScalarExceptions();
   }
-
-  /*
-   * (non-Javadoc)
-   * 
-   * @see java.lang.Object#equals(java.lang.Object)
-   */
-  public boolean equals(Object arg0) {
-    if (arg0 instanceof SSANewInstruction) {
-      SSANewInstruction other = (SSANewInstruction) arg0;
-      return result == other.result && site.equals(other.site);
-    } else {
-      return false;
-    }
-  }
-
 }