Modify CSCallSite, check existence of Edge via Edge.equals(Object) instead of just callee (CSMethod)

Author: silverbullettt

src/main/java/pascal/taie/analysis/pta/core/cs/element/CSCallSite.java

@@ -25,10 +25,8 @@
 import pascal.taie.analysis.graph.callgraph.Edge;
 import pascal.taie.analysis.pta.core.cs.context.Context;
 import pascal.taie.ir.stmt.Invoke;
-import pascal.taie.util.collection.ArraySet;
-import pascal.taie.util.collection.HybridIndexableSet;
+import pascal.taie.util.collection.Sets;
 
-import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Set;
 
@@ -44,12 +42,10 @@ public class CSCallSite extends AbstractCSElement {
      */
     private final CSMethod container;
 
-    private final Set<CSMethod> callees = new HybridIndexableSet<>(true);
-
     /**
      * Call edges from this call site.
      */
-    private final ArrayList<Edge<CSCallSite, CSMethod>> edges = new ArrayList<>(4);
+    private final Set<Edge<CSCallSite, CSMethod>> edges = Sets.newHybridSet();
 
     CSCallSite(Invoke callSite, Context context, CSMethod container) {
         super(context);
@@ -69,14 +65,11 @@ public CSMethod getContainer() {
     }
 
     public boolean addEdge(Edge<CSCallSite, CSMethod> edge) {
-        if (callees.add(edge.getCallee())) {
-            return edges.add(edge);
-        }
-        return false;
+        return edges.add(edge);
     }
 
     public Set<Edge<CSCallSite, CSMethod>> getEdges() {
-        return Collections.unmodifiableSet(new ArraySet<>(edges, true));
+        return Collections.unmodifiableSet(edges);
     }
 
     @Override

src/main/java/pascal/taie/analysis/pta/plugin/invokedynamic/LambdaCallEdge.java

@@ -29,7 +29,6 @@
 import pascal.taie.analysis.pta.core.cs.element.CSMethod;
 import pascal.taie.ir.exp.InvokeDynamic;
 import pascal.taie.ir.exp.Var;
-import pascal.taie.util.Hashes;
 
 import java.util.List;
 
@@ -77,6 +76,9 @@ public boolean equals(Object o) {
 
     @Override
     public int hashCode() {
-        return Hashes.hash(super.hashCode(), lambdaIndy, lambdaContext);
+        int result = super.hashCode();
+        result = 31 * result + lambdaIndy.hashCode();
+        result = 31 * result + lambdaContext.hashCode();
+        return result;
     }
 }