Merge branch 'development' of github.com:pdschubert/phasar into development

pdschubert · pdschubert · commit a0a67d051620 · 2020-01-20T12:04:34.000+01:00
diff --git a/external/googletest b/external/googletest
@@ -1 +1 @@
-Subproject commit f966ed158177f2ed6ff2c402effb16f7f00ca40b
+Subproject commit 2fe3bd994b3189899d93f1d5a881e725e046fdc2
diff --git a/external/json b/external/json
@@ -1 +1 @@
-Subproject commit ea60d40f4a60a47d3be9560d8f7bc37c163fe47b
+Subproject commit e3c28afb61227043dd7c0f9168b9394dfb016f87
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.cpp
@@ -305,7 +305,9 @@ IFDSUninitializedVariables::getCallFlowFunction(
             }
           }
           return res;*/
-          return {};
+
+          // propagate zero
+          return {source};
         }
       }
     };
diff --git a/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariablesTest.cpp b/unittests/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariablesTest.cpp
@@ -210,6 +210,7 @@ TEST_F(IFDSUninitializedVariablesTest, UninitTest_10_SHOULD_LEAK) {
              IFDSUninitializedVariables::v_t, IFDSUninitializedVariables::i_t>
       Solver(*UninitProblem);
   Solver.solve();
+  UninitProblem->emitTextReport(std::cout, Solver.getSolverResults());
   map<int, set<string>> GroundTruth;
   //%2 = load i32, i32 %1
   GroundTruth[2] = {"0"};

Original file line number	Diff line number	Diff line change
`@@ -305,7 +305,9 @@ IFDSUninitializedVariables::getCallFlowFunction(`
`305`	`305`	`}`
`306`	`306`	`}`
`307`	`307`	`return res;*/`
`308`		`- return {};`
	`308`	`+`
	`309`	`+ // propagate zero`
	`310`	`+ return {source};`
`309`	`311`	`}`
`310`	`312`	`}`
`311`	`313`	`};`