working on IDEIIAA fix

Author: pdschubert

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEInstInteractionAnalysis.h

@@ -286,11 +286,17 @@ class IDEInstInteractionAnalysisT
                     Problem.OnlyConsiderLocalAliases)) {}
 
           container_type computeTargets(d_t Src) override {
+            // Override old value(s), i.e., kill value(s) that is written to and
+            // generate from value that is stored.
+            if (Store->getPointerOperand() == Src || PointerPTS->count(Src)) {
+              return {};
+            }
             container_type Facts;
             Facts.insert(Src);
             if (IDEInstInteractionAnalysisT::isZeroValueImpl(Src)) {
               return Facts;
             }
+            // y/Y now obtains its new value(s) from x/X
             // If a value is stored that holds we must generate all potential
             // memory locations the store might write to.
             if (Store->getValueOperand() == Src || ValuePTS->count(Src)) {
@@ -324,9 +330,9 @@ class IDEInstInteractionAnalysisT
     //
     // Flow function:
     //
-    //             0  x
-    //             |  |\
-    // store x y   |  | \
+    //             0  x  y
+    //             |  |\ |
+    // store x y   |  | \|
     //             v  v  v
     //             0  x  y
     //
@@ -343,7 +349,13 @@ class IDEInstInteractionAnalysisT
           ~IIAAFlowFunction() override = default;
 
           container_type computeTargets(d_t Src) override {
+            // Override old value, i.e., kill value that is written to and
+            // generate from value that is stored.
+            if (Store->getPointerOperand() == Src) {
+              return {};
+            }
             container_type Facts;
+            // y now obtains its new value from x
             if (Load == Src || Load->getPointerOperand() == Src) {
               Facts.insert(Src);
               Facts.insert(Load->getPointerOperand());

test/llvm_test_code/inst_interaction/CMakeLists.txt

@@ -9,7 +9,6 @@ set(Sources
   basic_08.cpp
   basic_09.cpp
   basic_10.cpp
-  basic_11.cpp
   call_01.cpp
   call_02.cpp
   call_03.cpp
@@ -19,7 +18,8 @@ set(Sources
   global_01.cpp
   global_02.cpp
   heap_01.cpp
-  KillTest.cpp
+  KillTest_01.cpp
+  KillTest_02.cpp
   return_01.cpp
   rvo_01.cpp
   struct_01.cpp

…_test_code/inst_interaction/KillTest.cpp …st_code/inst_interaction/KillTest_01.cpptest/llvm_test_code/inst_interaction/KillTest.cpp renamed to test/llvm_test_code/inst_interaction/KillTest_01.cpp test/llvm_test_code/inst_interaction/KillTest.cpp renamed to test/llvm_test_code/inst_interaction/KillTest_01.cpp

@@ -4,4 +4,4 @@ int main() {
   int k = i;
   j = 42;
   return 0;
-}
+}

test/llvm_test_code/inst_interaction/KillTest_02.cpp

@@ -0,0 +1,12 @@
+int A = 42;
+int B;
+
+void initB() { B = 21; }
+
+int main() {
+  int C = B;
+
+  initB();
+
+  return A + B + C;
+}

test/llvm_test_code/inst_interaction/basic_11.cpp

@@ -378,11 +378,6 @@ TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_10) {
   doAnalysisAndCompareResults("basic_10_cpp.ll", GroundTruth, false);
 }
 
-TEST_F(IDEInstInteractionAnalysisTest, HandleBasicTest_11) {
-  std::set<IIACompactResult_t> GroundTruth;
-  doAnalysisAndCompareResults("basic_11_cpp.ll", GroundTruth, false);
-}
-
 // TEST_F(IDEInstInteractionAnalysisTest, RetFail) {
 //   std::set<IIACompactResult_t> GroundTruth;
 //   doAnalysisAndCompareResults("dump_trace_ld-te.ll", GroundTruth, true);
@@ -572,7 +567,25 @@ TEST_F(IDEInstInteractionAnalysisTest, KillTest_01) {
   GroundTruth.emplace(
       std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
           "main", 12, "k", {"3", "9", "8", "1", "5", "6"}));
-  doAnalysisAndCompareResults("KillTest_cpp.ll", GroundTruth, false);
+  doAnalysisAndCompareResults("KillTest_01_cpp.ll", GroundTruth, false);
+}
+
+TEST_F(IDEInstInteractionAnalysisTest, KillTest_02) {
+  std::set<IIACompactResult_t> GroundTruth;
+  GroundTruth.emplace(
+      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
+          "main", 12, "retval", {"4", "6"}));
+  GroundTruth.emplace(
+      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
+          "main", 12, "A", {"0", "10"}));
+  GroundTruth.emplace(
+      std::tuple<std::string, size_t, std::string, BitVectorSet<std::string>>(
+          "main", 12, "B", {"1", "2", "7", "11"}));
+  //   GroundTruth.emplace(
+  //       std::tuple<std::string, size_t, std::string,
+  //       BitVectorSet<std::string>>(
+  //           "main", 12, "C", {"5", "8", "13"}));
+  doAnalysisAndCompareResults("KillTest_02_cpp.ll", GroundTruth, true);
 }
 
 TEST_F(IDEInstInteractionAnalysisTest, HandleReturnTest_01) {