Merge pull request #488 from secure-software-engineering/f-IIAAnalysisFixes

F iia analysis fixes

Author: pdschubert

.clang-tidy

@@ -51,11 +51,11 @@ CheckOptions:
   - key:             readability-identifier-naming.VariableCase
     value:           CamelCase
   - key:             readability-identifier-naming.VariableIgnoredRegexp
-    value:           (c|d|d1|d2|d3|d4|d5|d5_restoredCtx|eP|f|f3|f4|f5|fCalleeSummary|g|n|dPrime|fPrime)
+    value:           (c|d|d1|d2|d3|d4|d5|d5_restoredCtx|eP|f|f3|f4|f5|fCalleeSummary|g|n|nPrime|dPrime|fPrime)
   - key:             readability-identifier-naming.ParameterIgnoredRegexp
     value:           (d|d1|d2|d3|d4|d5|eP|f|n)
   - key:             readability-identifier-naming.FunctionIgnoredRegexp
-    value:           (try_emplace|from_json|to_json)
+    value:           (try_emplace|from_json|to_json|equal_to)
   - key:             cppcoreguidelines-special-member-functions.AllowSoleDefaultDtor
     value:           1
   - key:             cppcoreguidelines-special-member-functions.AllowMissingMoveFunctions

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

@@ -80,8 +80,10 @@ class OpenSSLEVPKDFCTXDescription : public TypeStateDescription {
       IDESolver<IDETypeStateAnalysisDomain> &KDFAnalysisResults)
       : KDFAnalysisResults(KDFAnalysisResults) {}
 
-  [[nodiscard]] bool isFactoryFunction(const std::string &FuncName) const override;
-  [[nodiscard]] bool isConsumingFunction(const std::string &FuncName) const override;
+  [[nodiscard]] bool
+  isFactoryFunction(const std::string &FuncName) const override;
+  [[nodiscard]] bool
+  isConsumingFunction(const std::string &FuncName) const override;
   [[nodiscard]] bool isAPIFunction(const std::string &FuncName) const override;
   [[nodiscard]] TypeStateDescription::State
   getNextState(std::string Tok, TypeStateDescription::State S) const override;

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/TypeStateDescriptions/OpenSSLEVPKDFCTXDescription.h

@@ -682,30 +682,30 @@ class IDESolver
     n_t n = Edge.getTarget();
     d_t d2 = Edge.factAtTarget();
     EdgeFunctionPtrType f = jumpFunction(Edge);
-    for (const auto Fn : ICF->getSuccsOf(n)) {
+    for (const auto nPrime : ICF->getSuccsOf(n)) {
       FlowFunctionPtrType FlowFunc =
-          CachedFlowEdgeFunctions.getNormalFlowFunction(n, Fn);
+          CachedFlowEdgeFunctions.getNormalFlowFunction(n, nPrime);
       INC_COUNTER("FF Queries", 1, PAMM_SEVERITY_LEVEL::Full);
       const container_type Res = computeNormalFlowFunction(FlowFunc, d1, d2);
       ADD_TO_HISTOGRAM("Data-flow facts", res.size(), 1,
                        PAMM_SEVERITY_LEVEL::Full);
-      saveEdges(n, Fn, d2, Res, false);
+      saveEdges(n, nPrime, d2, Res, false);
       for (d_t d3 : Res) {
         EdgeFunctionPtrType g =
-            CachedFlowEdgeFunctions.getNormalEdgeFunction(n, d2, Fn, d3);
+            CachedFlowEdgeFunctions.getNormalEdgeFunction(n, d2, nPrime, d3);
         LOG_IF_ENABLE(BOOST_LOG_SEV(lg::get(), DEBUG)
                       << "Queried Normal Edge Function: " << g->str());
         EdgeFunctionPtrType fPrime = f->composeWith(g);
         if (SolverConfig.emitESG()) {
-          IntermediateEdgeFunctions[std::make_tuple(n, d2, Fn, d3)].push_back(
-              g);
+          IntermediateEdgeFunctions[std::make_tuple(n, d2, nPrime, d3)]
+              .push_back(g);
         }
         LOG_IF_ENABLE(BOOST_LOG_SEV(lg::get(), DEBUG)
                           << "Compose: " << g->str() << " * " << f->str()
                           << " = " << fPrime->str();
                       BOOST_LOG_SEV(lg::get(), DEBUG) << ' ');
         INC_COUNTER("EF Queries", 1, PAMM_SEVERITY_LEVEL::Full);
-        propagate(d1, Fn, d3, fPrime, nullptr, false);
+        propagate(d1, nPrime, d3, fPrime, nullptr, false);
       }
     }
   }

include/phasar/PhasarLLVM/DataFlowSolver/IfdsIde/Solver/IDESolver.h

@@ -18,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/llvm_test_code/inst_interaction/CMakeLists.txt

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

…_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

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