Add more constness

secure-software-engineering · May 29, 2024 · 8e45bee · 8e45bee
1 parent 993023f
commit 8e45bee
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 11 deletions.
diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.h
@@ -29,7 +29,7 @@ buildLLVMBasedCallGraph(LLVMProjectIRDB &IRDB, CallGraphAnalysisType CGType,
                         Soundness S = Soundness::Soundy);
 
 [[nodiscard]] LLVMBasedCallGraph
-buildLLVMBasedCallGraph(LLVMProjectIRDB &IRDB, Resolver &CGResolver,
+buildLLVMBasedCallGraph(const LLVMProjectIRDB &IRDB, Resolver &CGResolver,
                         llvm::ArrayRef<const llvm::Function *> EntryPoints,
                         Soundness S = Soundness::Soundy);
 
@@ -41,7 +41,7 @@ buildLLVMBasedCallGraph(LLVMProjectIRDB &IRDB, CallGraphAnalysisType CGType,
                         Soundness S = Soundness::Soundy);
 
 [[nodiscard]] LLVMBasedCallGraph
-buildLLVMBasedCallGraph(LLVMProjectIRDB &IRDB, Resolver &CGResolver,
+buildLLVMBasedCallGraph(const LLVMProjectIRDB &IRDB, Resolver &CGResolver,
                         llvm::ArrayRef<std::string> EntryPoints,
                         Soundness S = Soundness::Soundy);
 } // namespace psr

diff --git a/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h b/include/phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h
@@ -37,6 +37,7 @@
 #include "llvm/Support/raw_ostream.h"
 
 #include "nlohmann/json.hpp"
+#include "nlohmann/json_fwd.hpp"
 
 namespace psr {
 class LLVMTypeHierarchy;
@@ -88,10 +89,16 @@ class LLVMBasedICFG : public LLVMBasedCFG, public ICFGBase<LLVMBasedICFG> {
                          bool IncludeGlobals = true);
 
   /// Creates an ICFG with an already given call-graph
-  explicit LLVMBasedICFG(CallGraph<n_t, f_t> CG, LLVMProjectIRDB *IRDB);
+  explicit LLVMBasedICFG(CallGraph<n_t, f_t> CG, const LLVMProjectIRDB *IRDB);
 
-  explicit LLVMBasedICFG(LLVMProjectIRDB *IRDB,
+  explicit LLVMBasedICFG(const LLVMProjectIRDB *IRDB,
                          const nlohmann::json &SerializedCG);
+  // To avoid ambiguity with the first ctor (json implicitly converts to
+  // CallGraphAnalysisType for whatever reason)
+  explicit LLVMBasedICFG(LLVMProjectIRDB *IRDB,
+                         const nlohmann::json &SerializedCG)
+      : LLVMBasedICFG(static_cast<const LLVMProjectIRDB *>(IRDB),
+                      SerializedCG) {}
 
   // Deleter of LLVMTypeHierarchy may be unknown here...
   ~LLVMBasedICFG();
@@ -124,7 +131,7 @@ class LLVMBasedICFG : public LLVMBasedCFG, public ICFGBase<LLVMBasedICFG> {
   }
 
   /// Gets the underlying IRDB
-  [[nodiscard]] LLVMProjectIRDB *getIRDB() const noexcept { return IRDB; }
+  [[nodiscard]] const LLVMProjectIRDB *getIRDB() const noexcept { return IRDB; }
 
   /// Returns true, if a function was generated by phasar.
   [[nodiscard]] static bool
@@ -164,7 +171,7 @@ class LLVMBasedICFG : public LLVMBasedCFG, public ICFGBase<LLVMBasedICFG> {
   // ---
 
   LLVMBasedCallGraph CG;
-  LLVMProjectIRDB *IRDB = nullptr;
+  const LLVMProjectIRDB *IRDB = nullptr;
   LLVMVFTableProvider VTP;
 };
 

diff --git a/lib/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.cpp b/lib/PhasarLLVM/ControlFlow/LLVMBasedCallGraphBuilder.cpp
@@ -22,7 +22,7 @@
 namespace {
 using namespace psr;
 struct Builder {
-  LLVMProjectIRDB *IRDB = nullptr;
+  const LLVMProjectIRDB *IRDB = nullptr;
   Resolver *Res = nullptr;
   CallGraphBuilder<const llvm::Instruction *, const llvm::Function *>
       CGBuilder{};
@@ -249,7 +249,7 @@ bool Builder::constructDynamicCall(const llvm::Instruction *CS) {
 } // namespace
 
 auto psr::buildLLVMBasedCallGraph(
-    LLVMProjectIRDB &IRDB, Resolver &CGResolver,
+    const LLVMProjectIRDB &IRDB, Resolver &CGResolver,
     llvm::ArrayRef<const llvm::Function *> EntryPoints, Soundness S)
     -> LLVMBasedCallGraph {
   Builder B{&IRDB, &CGResolver};
@@ -297,7 +297,8 @@ auto psr::buildLLVMBasedCallGraph(LLVMProjectIRDB &IRDB,
   return buildLLVMBasedCallGraph(IRDB, CGType, EntryPointFns, TH, VTP, PT, S);
 }
 
-auto psr::buildLLVMBasedCallGraph(LLVMProjectIRDB &IRDB, Resolver &CGResolver,
+auto psr::buildLLVMBasedCallGraph(const LLVMProjectIRDB &IRDB,
+                                  Resolver &CGResolver,
                                   llvm::ArrayRef<std::string> EntryPoints,
                                   Soundness S) -> LLVMBasedCallGraph {
   auto EntryPointFns = getEntryFunctions(IRDB, EntryPoints);

diff --git a/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp b/lib/PhasarLLVM/ControlFlow/LLVMBasedICFG.cpp
@@ -86,10 +86,11 @@ LLVMBasedICFG::LLVMBasedICFG(LLVMProjectIRDB *IRDB, Resolver &CGResolver,
   initialize(IRDB, CGResolver, EntryPoints, S, IncludeGlobals);
 }
 
-LLVMBasedICFG::LLVMBasedICFG(CallGraph<n_t, f_t> CG, LLVMProjectIRDB *IRDB)
+LLVMBasedICFG::LLVMBasedICFG(CallGraph<n_t, f_t> CG,
+                             const LLVMProjectIRDB *IRDB)
     : CG(std::move(CG)), IRDB(IRDB), VTP(*IRDB) {}
 
-LLVMBasedICFG::LLVMBasedICFG(LLVMProjectIRDB *IRDB,
+LLVMBasedICFG::LLVMBasedICFG(const LLVMProjectIRDB *IRDB,
                              const nlohmann::json &SerializedCG)
     : CG(CallGraph<n_t, f_t>::deserialize(
           SerializedCG,