Fix Evaluate bug and solved 45/52 tests

Author: 1475505

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

@@ -100,7 +100,7 @@ public Value meetValue(Value v1, Value v2) {
         if (v1.isUndef())   return v2;
         if (v2.isUndef())   return v1;
         if (v1.getConstant() == v2.getConstant()){
-            return Value.makeConstant(v1.getConstant());
+            return v1;
         } else {
             return Value.getNAC();
         }
@@ -119,7 +119,7 @@ public boolean transferNode(Stmt stmt, CPFact in, CPFact out) {
             } else {
                 out.update((Var) gen.get(), Value.getNAC());
             }
-            System.out.println("transferred (old_out:" + old_out.toString() + ")"+ stmt.toString() + " from" + in.toString() + "->" + out.toString());
+            System.out.println(stmt.getLineNumber() + " | transferred (old_out:" + old_out.toString() + ")"+ stmt.toString() + " from" + in.toString() + "->" + out.toString());
         }
         return out.equals(old_out);
     }
@@ -163,9 +163,12 @@ public static Value evaluate(Exp exp, CPFact in) {
         } else if (exp instanceof BinaryExp){
             Value op1 = evaluate(((BinaryExp) exp).getOperand1(), in);
             Value op2 = evaluate(((BinaryExp) exp).getOperand2(), in);
-            if ( !op1.isConstant() || !op2.isConstant()){
+            if ( op1.isNAC() || op2.isNAC()){
                 return Value.getNAC();
             }
+            if ( !op1.isConstant() || !op2.isConstant()){
+                return Value.getUndef();
+            }
             BinaryExp.Op op = ((BinaryExp) exp).getOperator();
             if (op instanceof ArithmeticExp.Op) {
                 switch ((ArithmeticExp.Op)op) {
@@ -228,7 +231,7 @@ public static Value evaluate(Exp exp, CPFact in) {
                 }
             }
             if (op instanceof BitwiseExp.Op) {
-                // maybe no need to process it? NO!!!
+                // maybe no need to process it? NO!!! logic rather than bitwise.
                 switch ((BitwiseExp.Op)op){
                     case OR -> {
                         return Value.makeConstant(op1.getConstant() | op2.getConstant());
@@ -241,7 +244,15 @@ public static Value evaluate(Exp exp, CPFact in) {
                     }
                 }
             }
+            return Value.getUndef();
         }
+        /*
+        f(y,z) =
+            val(y) op val(z) // if val(y) and val(z) are constants
+            NAC // if val(y) or val(z) is NAC
+            UNDEF // otherwise
+         对于其它情况，该方法会像我们在第 2.1 节提到的那样返回 NAC。
+         */
         return Value.getNAC();
     }
 }

A2/tai-e/src/test/java/pascal/taie/analysis/dataflow/analysis/constprop/MyCPTest.java

@@ -0,0 +1,39 @@
+/*
+ * Tai-e: A Static Analysis Framework for Java
+ *
+ * Copyright (C) 2022 Tian Tan <[email protected]>
+ * Copyright (C) 2022 Yue Li <[email protected]>
+ *
+ * This file is part of Tai-e.
+ *
+ * Tai-e is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License
+ * as published by the Free Software Foundation, either version 3
+ * of the License, or (at your option) any later version.
+ *
+ * Tai-e is distributed in the hope that it will be useful,but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
+ * or FITNESS FOR A PARTICULAR PURPOSE. See the GNU Lesser General
+ * Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with Tai-e. If not, see <https://www.gnu.org/licenses/>.
+ */
+
+package pascal.taie.analysis.dataflow.analysis.constprop;
+
+import org.junit.Test;
+import pascal.taie.analysis.Tests;
+
+public class MyCPTest {
+
+    void testCP(String inputClass) {
+        Tests.test(inputClass, "src/test/resources/dataflow/constprop/my/",
+                ConstantPropagation.ID, "edge-refine:false");
+    }
+
+    @Test
+    public void BinaryOp() {
+        testCP("BinaryOp");
+    }
+}

A2/tai-e/src/test/resources/dataflow/constprop/my/BinaryOp-constprop-expected.txt

@@ -0,0 +1,3 @@
+------------------- <BinaryOp: void undefined()> (constprop) --------------------
+Expected: [1@L31] y = x + %intconst0; {%intconst0=1}
+Expected: [2@L31] return; {%intconst0=1}

A2/tai-e/src/test/resources/dataflow/constprop/my/BinaryOp.java

@@ -0,0 +1,41 @@
+class BinaryOp {
+
+//    void constant1() {
+//        int i0 = 0, i1 = 1, i2 = 2;
+//        int x = 1 + 2;
+//        int y = i0 + 3;
+//        int z = i1 + i2;
+//    }
+//
+//    void constant2() {
+//        int i1 = 1;
+//        int x = i1 + 10;
+//        int y = x * 5;
+//        int z = y - 12;
+//    }
+//
+//    void constant3() {
+//        int i5 = 5;
+//        int x = i5 * 77;
+//        int y = x / 6;
+//        int z = y % 5;
+//    }
+//
+//    void NAC(int p) {
+//        int x = p;
+//        int y = 1 + x;
+//    }
+
+    void undefined() {
+        int x;
+        int y = x + 1;
+    }
+
+//    void longExpressions() {
+//        int x = 1, y = 2, z = 3;
+//        int a = x + y * z;
+//        int b = (x - y) * z;
+//        int c = (x - y) / z;
+//        int d = (x + y) % z;
+//    }
+}