refactor solver

Feysh-Group · Mar 21, 2022 · 4075ac3 · 4075ac3
1 parent a9bf23a
commit 4075ac3
Showing 1 changed file with 13 additions and 4 deletions.
diff --git a/qilin.core/src/qilin/core/solver/Solver.java b/qilin.core/src/qilin/core/solver/Solver.java
@@ -38,7 +38,7 @@
 
 import java.util.*;
 
-public final class Solver extends Propagator {
+public class Solver extends Propagator {
     private final TreeSet<ValNode> valNodeWorkList = new TreeSet<>();
     private final PAG pag;
     private final PTA pta;
@@ -279,14 +279,23 @@ private void activateConstraints(QueueReader<VirtualCallSite> newCalls, QueueRea
         }
     }
 
-    private void propagatePTS(final ValNode pointer, PointsToSetInternal other) {
+    protected void propagatePTS(final ValNode pointer, PointsToSetInternal other) {
         final PointsToSetInternal addTo = pointer.makeP2Set();
-        if (addTo.addAll(other, null)) {
+        P2SetVisitor p2SetVisitor = new P2SetVisitor() {
+            @Override
+            public void visit(Node n) {
+                if(addTo.add(n)) {
+                    returnValue = true;
+                }
+            }
+        };
+        other.forall(p2SetVisitor);
+        if (p2SetVisitor.getReturnValue()) {
             valNodeWorkList.add(pointer);
         }
     }
 
-    private void propagatePTS(final ValNode pointer, AllocNode heap) {
+    protected void propagatePTS(final ValNode pointer, AllocNode heap) {
         if (pointer.makeP2Set().add(heap)) {
             valNodeWorkList.add(pointer);
         }