pass all local tests in A2

Author: 1475505

A2/tai-e/src/main/java/pascal/taie/analysis/dataflow/analysis/constprop/ConstantPropagation.java

@@ -85,7 +85,7 @@ public void meetInto(CPFact fact, CPFact target) {
             target.update(var, meetValue(fact.get(var), value));
         });
         fact.forEach((Var var, Value value) -> {
-            fact.update(var, meetValue(target.get(var), value));
+            target.update(var, meetValue(target.get(var), value));
         });
     }
 
@@ -110,14 +110,16 @@ public Value meetValue(Value v1, Value v2) {
     public boolean transferNode(Stmt stmt, CPFact in, CPFact out) {
         // TODO - finish me
         var gen = stmt.getDef();
-        CPFact old_out = new CPFact();
-        old_out = out.copy();
+        CPFact old_out = out.copy();
+        out.copyFrom(in);
         if (gen.isPresent() && gen.get() instanceof Var) {
-            if (canHoldInt((Var) gen.get()) && ((DefinitionStmt<?, ?>) stmt).getRValue() instanceof Var) {
+            if (canHoldInt((Var) gen.get()) && ((DefinitionStmt<?, ?>) stmt).getRValue() != null) {
                 out.update((Var) gen.get(), evaluate(((DefinitionStmt<?, ?>) stmt).getRValue(), in));
+                System.out.println((((DefinitionStmt<?, ?>) stmt).getRValue()).toString());
             } else {
                 out.update((Var) gen.get(), Value.getNAC());
             }
+            System.out.println("transferred (old_out:" + old_out.toString() + ")"+ stmt.toString() + " from" + in.toString() + "->" + out.toString());
         }
         return out.equals(old_out);
     }
@@ -150,12 +152,20 @@ public static boolean canHoldInt(Var var) {
     public static Value evaluate(Exp exp, CPFact in) {
         // TODO - finish me
         if (exp instanceof Var){
-            return in.get((Var) exp);
+            if (canHoldInt((Var) exp)) {
+                System.out.println("Evaluate Var " + exp.toString() + "==" + in.get((Var) exp).toString());
+                return in.get((Var) exp);
+            } else {
+                return Value.getNAC();
+            }
         } else if (exp instanceof IntLiteral){
             return Value.makeConstant(((IntLiteral)exp).getValue());
         } else if (exp instanceof BinaryExp){
             Value op1 = evaluate(((BinaryExp) exp).getOperand1(), in);
             Value op2 = evaluate(((BinaryExp) exp).getOperand2(), in);
+            if ( !op1.isConstant() || !op2.isConstant()){
+                return Value.getNAC();
+            }
             BinaryExp.Op op = ((BinaryExp) exp).getOperator();
             if (op instanceof ArithmeticExp.Op) {
                 switch ((ArithmeticExp.Op)op) {
@@ -217,9 +227,19 @@ public static Value evaluate(Exp exp, CPFact in) {
                     }
                 }
             }
-            if (op instanceof BitwiseExp.Op){
-                // maybe no need to process it?
-                ;
+            if (op instanceof BitwiseExp.Op) {
+                // maybe no need to process it? NO!!!
+                switch ((BitwiseExp.Op)op){
+                    case OR -> {
+                        return Value.makeConstant(op1.getConstant() | op2.getConstant());
+                    }
+                    case AND -> {
+                        return Value.makeConstant(op1.getConstant() & op2.getConstant());
+                    }
+                    case XOR -> {
+                        return Value.makeConstant(op1.getConstant() ^ op2.getConstant());
+                    }
+                }
             }
         }
         return Value.getNAC();

A2/tai-e/src/main/java/pascal/taie/analysis/dataflow/solver/Solver.java

@@ -78,6 +78,15 @@ private DataflowResult<Node, Fact> initialize(CFG<Node> cfg) {
 
     protected void initializeForward(CFG<Node> cfg, DataflowResult<Node, Fact> result) {
         // TODO - finish me
+        result.setOutFact(cfg.getEntry(), analysis.newBoundaryFact(cfg));
+        result.setInFact(cfg.getEntry(), analysis.newBoundaryFact(cfg));
+        for (Node node : cfg) {
+            if (node.equals(cfg.getEntry())){
+                continue;
+            }
+            result.setOutFact(node, analysis.newInitialFact());
+            result.setInFact(node, analysis.newInitialFact());
+        }
     }
 
     protected void initializeBackward(CFG<Node> cfg, DataflowResult<Node, Fact> result) {

A2/tai-e/src/main/java/pascal/taie/analysis/dataflow/solver/WorkListSolver.java

@@ -26,6 +26,11 @@
 import pascal.taie.analysis.dataflow.fact.DataflowResult;
 import pascal.taie.analysis.graph.cfg.CFG;
 
+import java.sql.Array;
+import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.Queue;
+
 class WorkListSolver<Node, Fact> extends Solver<Node, Fact> {
 
     WorkListSolver(DataflowAnalysis<Node, Fact> analysis) {
@@ -35,6 +40,20 @@ class WorkListSolver<Node, Fact> extends Solver<Node, Fact> {
     @Override
     protected void doSolveForward(CFG<Node> cfg, DataflowResult<Node, Fact> result) {
         // TODO - finish me
+        Queue<Node> workList = new LinkedList<>(); // queue
+        for (Node node : cfg){
+            workList.add(node);
+        }
+        while (!workList.isEmpty()) {
+            Node node = workList.poll();
+            System.out.println("start processing " + node.toString());
+            for (Node n : cfg.getPredsOf(node)) {
+                analysis.meetInto(result.getOutFact(n), result.getInFact(node));
+            }
+            if (!analysis.transferNode(node, result.getInFact(node), result.getOutFact(node))) {
+                workList.addAll(cfg.getSuccsOf(node));
+            }
+        }
     }
 
     @Override