Merge branch 'development' into f-swift_code_style

secure-software-engineering · Jul 6, 2023 · beecb60 · beecb60
2 parents 510e5f1 + 349656f
commit beecb60
Show file tree

Hide file tree

Showing 156 changed files with 1,289 additions and 498 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -191,6 +191,13 @@ include_directories(SYSTEM ${Boost_INCLUDE_DIRS})
 # Disable clang-tidy for the external projects
 set(CMAKE_CXX_CLANG_TIDY "")
 
+# Nlohmann JSON
+
+set(JSON_BuildTests OFF)
+set(JSON_Install ON)
+add_subdirectory(external/json)
+include_directories(SYSTEM external/json/include/)
+
 # We need to work around the behavior of nlohmann_json_schema_validator and nlohmann_json here
 # The validator needs the json part, but if you include it, the library of nlohmann_json_schema_validator
 # is not installed, leading to linker error. But just including nlohmann_json is not sufficient, as
@@ -202,25 +209,15 @@ set(CMAKE_CXX_CLANG_TIDY "")
 #Override option of nlohmann_json_schema_validator to not build its tests
 set(BUILD_TESTS OFF CACHE BOOL "Build json-schema-validator-tests")
 
-# Make nlohmann_json_schema_validator happy by telling it how to find the single include of nlohmann_json
-include_directories(SYSTEM external/json/single_include/)
-
 if (PHASAR_IN_TREE)
   set_property(GLOBAL APPEND PROPERTY LLVM_EXPORTS nlohmann_json_schema_validator)
 endif()
 
-set(nlohmann_json_DIR ${PHASAR_SRC_DIR}/external/json/single_include/)
-
 # Json Schema Validator
 set(JSON_VALIDATOR_INSTALL ON)
 add_subdirectory(external/json-schema-validator)
 include_directories(SYSTEM external/json-schema-validator/src/)
 
-# now we finally add the subdirectory
-set(JSON_BuildTests OFF)
-set(JSON_Install ON)
-add_subdirectory(external/json)
-
 # Googletest
 if (NOT PHASAR_IN_TREE)
   add_subdirectory(external/googletest EXCLUDE_FROM_ALL)

diff --git a/external/googletest b/external/googletest
diff --git a/external/json b/external/json
diff --git a/external/json-schema-validator b/external/json-schema-validator
diff --git a/include/phasar/AnalysisStrategy/AnalysisSetup.h b/include/phasar/AnalysisStrategy/AnalysisSetup.h
@@ -7,8 +7,8 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_ANALYSISSTRATEGY_ANALYSISSETUP_H_
-#define PHASAR_PHASARLLVM_ANALYSISSTRATEGY_ANALYSISSETUP_H_
+#ifndef PHASAR_ANALYSISSTRATEGY_ANALYSISSETUP_H
+#define PHASAR_ANALYSISSTRATEGY_ANALYSISSETUP_H
 
 #include "phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h"
 #include "phasar/PhasarLLVM/Pointer/LLVMAliasSet.h"

diff --git a/include/phasar/AnalysisStrategy/DemandDrivenAnalysis.h b/include/phasar/AnalysisStrategy/DemandDrivenAnalysis.h
@@ -7,8 +7,8 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_ANALYSISSTRATEGY_DEMANDDRIVENANALYSIS_H_
-#define PHASAR_PHASARLLVM_ANALYSISSTRATEGY_DEMANDDRIVENANALYSIS_H_
+#ifndef PHASAR_ANALYSISSTRATEGY_DEMANDDRIVENANALYSIS_H
+#define PHASAR_ANALYSISSTRATEGY_DEMANDDRIVENANALYSIS_H
 
 namespace psr {
 

diff --git a/include/phasar/AnalysisStrategy/IncrementalUpdateAnalysis.h b/include/phasar/AnalysisStrategy/IncrementalUpdateAnalysis.h
@@ -7,8 +7,8 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_ANALYSISSTRATEGY_INCREMENTALUPDATEANALYSIS_H_
-#define PHASAR_PHASARLLVM_ANALYSISSTRATEGY_INCREMENTALUPDATEANALYSIS_H_
+#ifndef PHASAR_ANALYSISSTRATEGY_INCREMENTALUPDATEANALYSIS_H
+#define PHASAR_ANALYSISSTRATEGY_INCREMENTALUPDATEANALYSIS_H
 
 namespace psr {
 

diff --git a/include/phasar/AnalysisStrategy/ModuleWiseAnalysis.h b/include/phasar/AnalysisStrategy/ModuleWiseAnalysis.h
@@ -7,8 +7,8 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_ANALYSISSTRATEGY_MODULEWISEANALYSIS_H_
-#define PHASAR_PHASARLLVM_ANALYSISSTRATEGY_MODULEWISEANALYSIS_H_
+#ifndef PHASAR_ANALYSISSTRATEGY_MODULEWISEANALYSIS_H
+#define PHASAR_ANALYSISSTRATEGY_MODULEWISEANALYSIS_H
 
 namespace psr {
 

diff --git a/include/phasar/AnalysisStrategy/Strategies.h b/include/phasar/AnalysisStrategy/Strategies.h
@@ -7,8 +7,8 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_ANALYSISSTRATEGY_STRATEGIES_H
-#define PHASAR_PHASARLLVM_ANALYSISSTRATEGY_STRATEGIES_H
+#ifndef PHASAR_ANALYSISSTRATEGY_STRATEGIES_H
+#define PHASAR_ANALYSISSTRATEGY_STRATEGIES_H
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/raw_ostream.h"

diff --git a/include/phasar/AnalysisStrategy/VariationalAnalysis.h b/include/phasar/AnalysisStrategy/VariationalAnalysis.h
@@ -7,8 +7,8 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_ANALYSISSTRATEGY_VARIATIONALANALYSIS_H_
-#define PHASAR_PHASARLLVM_ANALYSISSTRATEGY_VARIATIONALANALYSIS_H_
+#ifndef PHASAR_ANALYSISSTRATEGY_VARIATIONALANALYSIS_H
+#define PHASAR_ANALYSISSTRATEGY_VARIATIONALANALYSIS_H
 
 #include "phasar/AnalysisStrategy/AnalysisSetup.h"
 

diff --git a/include/phasar/ControlFlow/CFGBase.h b/include/phasar/ControlFlow/CFGBase.h
@@ -7,8 +7,8 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_CONTROLFLOW_CFGBASE_H
-#define PHASAR_PHASARLLVM_CONTROLFLOW_CFGBASE_H
+#ifndef PHASAR_CONTROLFLOW_CFGBASE_H
+#define PHASAR_CONTROLFLOW_CFGBASE_H
 
 #include "phasar/Utils/ByRef.h"
 #include "phasar/Utils/TypeTraits.h"
@@ -150,4 +150,4 @@ constexpr bool is_cfg_v = is_crtp_base_of_v<CFGBase, ICF>
 
 } // namespace psr
 
-#endif // PHASAR_PHASARLLVM_CONTROLFLOW_CFGBASE_H
+#endif // PHASAR_CONTROLFLOW_CFGBASE_H
diff --git a/include/phasar/ControlFlow/CallGraph.h b/include/phasar/ControlFlow/CallGraph.h
@@ -7,8 +7,8 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_CONTROLFLOW_CALLGRAPH_H
-#define PHASAR_PHASARLLVM_CONTROLFLOW_CALLGRAPH_H
+#ifndef PHASAR_CONTROLFLOW_CALLGRAPH_H
+#define PHASAR_CONTROLFLOW_CALLGRAPH_H
 
 #include "phasar/ControlFlow/CallGraphBase.h"
 #include "phasar/Utils/ByRef.h"
@@ -301,4 +301,4 @@ extern template class psr::CallGraph<const llvm::Instruction *,
 extern template class psr::CallGraphBuilder<const llvm::Instruction *,
                                             const llvm::Function *>;
 
-#endif // PHASAR_PHASARLLVM_CONTROLFLOW_CALLGRAPH_H
+#endif // PHASAR_CONTROLFLOW_CALLGRAPH_H
diff --git a/include/phasar/ControlFlow/CallGraphAnalysisType.h b/include/phasar/ControlFlow/CallGraphAnalysisType.h
@@ -7,8 +7,8 @@
  *     Philipp Schubert, Fabian Schiebel and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_CALLGRAPHANALYSISTYPE_H
-#define PHASAR_PHASARLLVM_CALLGRAPHANALYSISTYPE_H
+#ifndef PHASAR_CONTROLFLOW_CALLGRAPHANALYSISTYPE_H
+#define PHASAR_CONTROLFLOW_CALLGRAPHANALYSISTYPE_H
 
 #include "llvm/ADT/StringRef.h"
 #include "llvm/Support/raw_ostream.h"
@@ -30,4 +30,4 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS, CallGraphAnalysisType CGA);
 
 } // namespace psr
 
-#endif // PHASAR_PHASARLLVM_CALLGRAPHANALYSISTYPE_H
+#endif // PHASAR_CONTROLFLOW_CALLGRAPHANALYSISTYPE_H
diff --git a/include/phasar/ControlFlow/CallGraphBase.h b/include/phasar/ControlFlow/CallGraphBase.h
@@ -7,8 +7,8 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_CONTROLFLOW_CALLGRAPHBASE_H
-#define PHASAR_PHASARLLVM_CONTROLFLOW_CALLGRAPHBASE_H
+#ifndef PHASAR_CONTROLFLOW_CALLGRAPHBASE_H
+#define PHASAR_CONTROLFLOW_CALLGRAPHBASE_H
 
 #include "phasar/Utils/ByRef.h"
 #include "phasar/Utils/TypeTraits.h"
@@ -56,4 +56,4 @@ template <typename Derived> class CallGraphBase {
 };
 } // namespace psr
 
-#endif // PHASAR_PHASARLLVM_CONTROLFLOW_CALLGRAPHBASE_H
+#endif // PHASAR_CONTROLFLOW_CALLGRAPHBASE_H
diff --git a/include/phasar/ControlFlow/ICFGBase.h b/include/phasar/ControlFlow/ICFGBase.h
@@ -7,8 +7,8 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_CONTROLFLOW_ICFGBASE_H
-#define PHASAR_PHASARLLVM_CONTROLFLOW_ICFGBASE_H
+#ifndef PHASAR_CONTROLFLOW_ICFGBASE_H
+#define PHASAR_CONTROLFLOW_ICFGBASE_H
 
 #include "phasar/ControlFlow/CFGBase.h"
 #include "phasar/ControlFlow/CallGraphBase.h"
@@ -134,4 +134,4 @@ constexpr bool is_icfg_v = is_crtp_base_of_v<ICFGBase, ICF>
 
 } // namespace psr
 
-#endif // PHASAR_PHASARLLVM_CONTROLFLOW_ICFGBASE_H
+#endif // PHASAR_CONTROLFLOW_ICFGBASE_H
diff --git a/include/phasar/ControlFlow/SpecialMemberFunctionType.h b/include/phasar/ControlFlow/SpecialMemberFunctionType.h
@@ -14,8 +14,8 @@
  *      Author: philipp
  */
 
-#ifndef PHASAR_PHASARLLVM_SPECIALMEMBERFUNCTIONTYPE_H
-#define PHASAR_PHASARLLVM_SPECIALMEMBERFUNCTIONTYPE_H
+#ifndef PHASAR_CONTROLFLOW_SPECIALMEMBERFUNCTIONTYPE_H
+#define PHASAR_CONTROLFLOW_SPECIALMEMBERFUNCTIONTYPE_H
 
 #include "llvm/ADT/StringRef.h"
 
@@ -40,4 +40,4 @@ llvm::raw_ostream &operator<<(llvm::raw_ostream &OS,
                               SpecialMemberFunctionType SMFT);
 } // namespace psr
 
-#endif // PHASAR_PHASARLLVM_SPECIALMEMBERFUNCTIONTYPE_H
+#endif // PHASAR_CONTROLFLOW_SPECIALMEMBERFUNCTIONTYPE_H
diff --git a/include/phasar/DataFlow/IfdsIde/DefaultEdgeFunctionSingletonCache.h b/include/phasar/DataFlow/IfdsIde/DefaultEdgeFunctionSingletonCache.h
@@ -7,8 +7,8 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_DEFAULTEDGEFUNCTIONSINGLETONCACHE_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_DEFAULTEDGEFUNCTIONSINGLETONCACHE_H
+#ifndef PHASAR_DATAFLOW_IFDSIDE_DEFAULTEDGEFUNCTIONSINGLETONCACHE_H
+#define PHASAR_DATAFLOW_IFDSIDE_DEFAULTEDGEFUNCTIONSINGLETONCACHE_H
 
 #include "phasar/DataFlow/IfdsIde/EdgeFunction.h"
 #include "phasar/DataFlow/IfdsIde/EdgeFunctionSingletonCache.h"
@@ -68,8 +68,9 @@ class DefaultEdgeFunctionSingletonCache
       if (LHS == RHS) {
         return true;
       }
-      auto Empty = llvm::DenseMapInfo<const EdgeFunctionTy *>::getEmptyKey();
-      auto Tombstone =
+      const auto *Empty =
+          llvm::DenseMapInfo<const EdgeFunctionTy *>::getEmptyKey();
+      const auto *Tombstone =
           llvm::DenseMapInfo<const EdgeFunctionTy *>::getTombstoneKey();
       if (LHS == Empty || LHS == Tombstone || RHS == Empty ||
           RHS == Tombstone) {
@@ -114,4 +115,4 @@ class DefaultEdgeFunctionSingletonCache<
 
 } // namespace psr
 
-#endif // PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_DEFAULTEDGEFUNCTIONSINGLETONCACHE_H
+#endif // PHASAR_DATAFLOW_IFDSIDE_DEFAULTEDGEFUNCTIONSINGLETONCACHE_H
diff --git a/include/phasar/DataFlow/IfdsIde/EdgeFunction.h b/include/phasar/DataFlow/IfdsIde/EdgeFunction.h
@@ -7,8 +7,8 @@
  *     Fabian Schiebel and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTION_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTION_H
+#ifndef PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTION_H
+#define PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTION_H
 
 #include "phasar/DataFlow/IfdsIde/EdgeFunctionSingletonCache.h"
 #include "phasar/Utils/ByRef.h"
@@ -300,7 +300,7 @@ class [[clang::trivial_abi]] EdgeFunction final : EdgeFunctionBase {
                 new (&Ret) ConcreteEF(std::move(EF.EF));
                 return Ret;
               } else {
-                if (auto Mem = EF.Cache->lookup(EF.EF)) {
+                if (const auto *Mem = EF.Cache->lookup(EF.EF)) {
                   return static_cast<const RefCounted<ConcreteEF> *>(Mem);
                 }
 
@@ -804,4 +804,4 @@ struct CastInfo<To, const psr::EdgeFunction<L>>
 #endif
 } // namespace llvm
 
-#endif // PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTION_H
+#endif // PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTION_H
diff --git a/include/phasar/DataFlow/IfdsIde/EdgeFunctionSingletonCache.h b/include/phasar/DataFlow/IfdsIde/EdgeFunctionSingletonCache.h
@@ -7,8 +7,8 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTIONSINGLETONCACHE_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTIONSINGLETONCACHE_H
+#ifndef PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTIONSINGLETONCACHE_H
+#define PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTIONSINGLETONCACHE_H
 
 #include "phasar/Utils/ByRef.h"
 
@@ -72,4 +72,4 @@ CachedEdgeFunction(EdgeFunctionTy, EdgeFunctionSingletonCache<EdgeFunctionTy> *)
 
 } // namespace psr
 
-#endif // PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTIONSINGLETONCACHE_H
+#endif // PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTIONSINGLETONCACHE_H
diff --git a/include/phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h b/include/phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h
@@ -7,8 +7,8 @@
  *     Philipp Schubert, Fabian Schiebel and others
  *****************************************************************************/
 
-#ifndef PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTIONUTILS_H_
-#define PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTIONUTILS_H_
+#ifndef PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTIONUTILS_H
+#define PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTIONUTILS_H
 
 #include "phasar/DataFlow/IfdsIde/EdgeFunction.h"
 #include "phasar/Utils/ByRef.h"
@@ -473,4 +473,4 @@ JoinEdgeFunction<L, N>::join(EdgeFunctionRef<JoinEdgeFunction> This,
 
 } // namespace psr
 
-#endif // PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTIONUTILS_H
+#endif // PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTIONUTILS_H
diff --git a/include/phasar/DataFlow/IfdsIde/EdgeFunctions.h b/include/phasar/DataFlow/IfdsIde/EdgeFunctions.h
@@ -14,8 +14,8 @@
  *      Author: pdschbrt
  */
 
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTIONS_H_
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_EDGEFUNCTIONS_H_
+#ifndef PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTIONS_H
+#define PHASAR_DATAFLOW_IFDSIDE_EDGEFUNCTIONS_H
 
 #include "phasar/DataFlow/IfdsIde/EdgeFunction.h"
 #include "phasar/Utils/ByRef.h"

diff --git a/include/phasar/DataFlow/IfdsIde/FlowFunctions.h b/include/phasar/DataFlow/IfdsIde/FlowFunctions.h
@@ -14,8 +14,8 @@
  *      Author: pdschbrt
  */
 
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_FLOWFUNCTIONS_H_
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_FLOWFUNCTIONS_H_
+#ifndef PHASAR_DATAFLOW_IFDSIDE_FLOWFUNCTIONS_H
+#define PHASAR_DATAFLOW_IFDSIDE_FLOWFUNCTIONS_H
 
 #include "phasar/Utils/TypeTraits.h"
 

diff --git a/include/phasar/DataFlow/IfdsIde/IDETabulationProblem.h b/include/phasar/DataFlow/IfdsIde/IDETabulationProblem.h
@@ -66,7 +66,7 @@ class IDETabulationProblem : public FlowFunctions<AnalysisDomainTy, Container>,
     assert(IRDB != nullptr);
   }
 
-  virtual ~IDETabulationProblem() = default;
+  ~IDETabulationProblem() override = default;
 
   /// Returns an edge function that represents the top element of the analysis.
   virtual EdgeFunction<l_t> allTopFunction() = 0;

diff --git a/include/phasar/DataFlow/IfdsIde/IFDSIDESolverConfig.h b/include/phasar/DataFlow/IfdsIde/IFDSIDESolverConfig.h
@@ -14,8 +14,8 @@
  *      Author: pdschbrt
  */
 
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSIDESOLVERCONFIG_H_
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSIDESOLVERCONFIG_H_
+#ifndef PHASAR_DATAFLOW_IFDSIDE_IFDSIDESOLVERCONFIG_H
+#define PHASAR_DATAFLOW_IFDSIDE_IFDSIDESOLVERCONFIG_H
 
 #include "phasar/Utils/EnumFlags.h"
 

diff --git a/include/phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h b/include/phasar/DataFlow/IfdsIde/IFDSTabulationProblem.h
@@ -7,8 +7,8 @@
  *     Philipp Schubert, Fabian Schiebel and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSTABULATIONPROBLEM_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_IFDSTABULATIONPROBLEM_H
+#ifndef PHASAR_DATAFLOW_IFDSIDE_IFDSTABULATIONPROBLEM_H
+#define PHASAR_DATAFLOW_IFDSIDE_IFDSTABULATIONPROBLEM_H
 
 #include "phasar/DataFlow/IfdsIde/EdgeFunctionUtils.h"
 #include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"

diff --git a/include/phasar/DataFlow/IfdsIde/InitialSeeds.h b/include/phasar/DataFlow/IfdsIde/InitialSeeds.h
@@ -7,8 +7,8 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_INITIALSEEDS_H
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_INITIALSEEDS_H
+#ifndef PHASAR_DATAFLOW_IFDSIDE_INITIALSEEDS_H
+#define PHASAR_DATAFLOW_IFDSIDE_INITIALSEEDS_H
 
 #include "phasar/Domain/BinaryDomain.h"
 #include "phasar/Utils/TypeTraits.h"
@@ -32,7 +32,7 @@ template <typename N, typename D, typename L> class InitialSeeds {
   InitialSeeds(const std::map<N, std::set<D>> &Seeds) {
     for (const auto &[Node, Facts] : Seeds) {
       for (const auto &Fact : Facts) {
-        this->Seeds[Node][Fact] = BinaryDomain::TOP;
+        this->Seeds[Node][Fact] = BinaryDomain::BOTTOM;
       }
     }
   }
@@ -42,7 +42,7 @@ template <typename N, typename D, typename L> class InitialSeeds {
   template <typename LL = L,
             typename = std::enable_if_t<std::is_same_v<LL, BinaryDomain>>>
   void addSeed(N Node, D Fact) {
-    addSeed(Node, Fact, BinaryDomain::TOP);
+    addSeed(Node, Fact, BinaryDomain::BOTTOM);
   }
 
   void addSeed(N Node, D Fact, L Value) {

diff --git a/include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCache.h b/include/phasar/DataFlow/IfdsIde/Solver/FlowEdgeFunctionCache.h
@@ -7,8 +7,8 @@
  *     Philipp Schubert and others
  *****************************************************************************/
 
-#ifndef PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_FLOWEDGEFUNCTIONCACHE_H_
-#define PHASAR_PHASARLLVM_DATAFLOWSOLVER_IFDSIDE_FLOWEDGEFUNCTIONCACHE_H_
+#ifndef PHASAR_DATAFLOW_IFDSIDE_SOLVER_FLOWEDGEFUNCTIONCACHE_H
+#define PHASAR_DATAFLOW_IFDSIDE_SOLVER_FLOWEDGEFUNCTIONCACHE_H
 
 #include "phasar/DataFlow/IfdsIde/EdgeFunctions.h"
 #include "phasar/DataFlow/IfdsIde/IDETabulationProblem.h"