fixed examples

Author: pdschubert

examples/llvm-hello_world/Makefile

@@ -8,7 +8,7 @@ MAIN_FILE := main.cpp
 CXX := clang++
 
 # compiler flags
-CXX_FLAGS := -std=c++14
+CXX_FLAGS := -std=c++17
 CXX_FLAGS += -Wall
 CXX_FLAGS += -Wextra
 CXX_FLAGS += -O0

examples/llvm-hello_world/main.cpp

@@ -1,4 +1,3 @@
-#include <cxxabi.h>
 #include <iostream>
 #include <llvm/IR/CallSite.h>
 #include <llvm/IR/Constants.h>
@@ -17,16 +16,6 @@
 #include <memory>
 #include <string>
 
-std::string cxx_demangle(const std::string &mangled_name) {
-  int status = 0;
-  char *demangled =
-      abi::__cxa_demangle(mangled_name.c_str(), NULL, NULL, &status);
-  std::string result((status == 0 && demangled != NULL) ? demangled
-                                                        : mangled_name);
-  free(demangled);
-  return result;
-}
-
 int main(int argc, char **argv) {
   if (argc != 2) {
     std::cout << "usage: <prog> <IR file>\n";
@@ -38,7 +27,8 @@ int main(int argc, char **argv) {
   std::unique_ptr<llvm::Module> M = llvm::parseIRFile(argv[1], Diag, *C);
   // check if the module is alright
   bool broken_debug_info = false;
-  if (M.get() == nullptr || llvm::verifyModule(*M, &llvm::errs(), &broken_debug_info)) {
+  if (M.get() == nullptr ||
+      llvm::verifyModule(*M, &llvm::errs(), &broken_debug_info)) {
     llvm::errs() << "error: module not valid\n";
     return 1;
   }

examples/plugins/Makefile

@@ -1,11 +1,10 @@
 CXX := clang++
-CXX_FLAGS := -std=c++14
+CXX_FLAGS := -std=c++17
 CXX_FLAGS += -Wall
 CXX_FLAGS += -Wno-return-type-c-linkage
 CXX_FLAGS += -O0
 CXX_FLAGS += -fPIC
 CXX_FLAGS += -shared
-INCLUDE_DIRS := -I/usr/local/include/wise_enum/
 LLVM_FLAGS := `llvm-config --cppflags`
 
 IFDSPluginSrc := MyIFDSProblem.cxx

examples/plugins/MyIFDSProblem.cxx

@@ -1,18 +1,23 @@
 #include "MyIFDSProblem.h"
 #include <iostream>
+#include <phasar/DB/ProjectIRDB.h>
 #include <phasar/PhasarLLVM/ControlFlow/LLVMBasedICFG.h>
-#include <phasar/PhasarLLVM/IfdsIde/FlowFunctions/Gen.h>
-#include <phasar/PhasarLLVM/IfdsIde/FlowFunctions/Identity.h>
-#include <phasar/PhasarLLVM/IfdsIde/FlowFunctions/KillAll.h>
+#include <phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions/Gen.h>
+#include <phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions/Identity.h>
+#include <phasar/PhasarLLVM/DataFlowSolver/IfdsIde/FlowFunctions/KillAll.h>
+#include <phasar/PhasarLLVM/Pointer/LLVMPointsToInfo.h>
+#include <phasar/PhasarLLVM/TypeHierarchy/LLVMTypeHierarchy.h>
 
 using namespace std;
 using namespace psr;
 
 // Factory function that is used to create an instance by the Phasar framework.
 unique_ptr<IFDSTabulationProblemPlugin>
-makeMyIFDSProblem(LLVMBasedICFG &I, vector<string> EntryPoints) {
+makeMyIFDSProblem(const ProjectIRDB *IRDB, const LLVMTypeHierarchy *TH,
+                  const LLVMBasedICFG *ICF, const LLVMPointsToInfo *PT,
+                  std::set<std::string> EntryPoints) {
   return unique_ptr<IFDSTabulationProblemPlugin>(
-      new MyIFDSProblem(I, EntryPoints));
+      new MyIFDSProblem(IRDB, TH, ICF, PT, EntryPoints));
 }
 
 // Is executed on plug-in load and has to register this plug-in to Phasar.
@@ -24,8 +29,12 @@ __attribute__((constructor)) void init() {
 // Is executed on unload, can be used to unregister the plug-in.
 __attribute__((destructor)) void fini() { cout << "fini - MyIFDSProblem\n"; }
 
-MyIFDSProblem::MyIFDSProblem(LLVMBasedICFG &I, vector<string> EntryPoints)
-    : IFDSTabulationProblemPlugin(I, EntryPoints) {}
+MyIFDSProblem::MyIFDSProblem(const ProjectIRDB *IRDB,
+                             const LLVMTypeHierarchy *TH,
+                             const LLVMBasedICFG *ICF,
+                             const LLVMPointsToInfo *PT,
+                             std::set<std::string> EntryPoints)
+    : IFDSTabulationProblemPlugin(IRDB, TH, ICF, PT, EntryPoints) {}
 
 shared_ptr<FlowFunction<const llvm::Value *>>
 MyIFDSProblem::getNormalFlowFunction(const llvm::Instruction *curr,
@@ -101,8 +110,9 @@ MyIFDSProblem::initialSeeds() {
   cout << "MyIFDSProblem::initialSeeds()\n";
   map<const llvm::Instruction *, set<const llvm::Value *>> SeedMap;
   for (auto &EntryPoint : EntryPoints) {
-    SeedMap.insert(std::make_pair(&icfg.getMethod(EntryPoint)->front().front(),
-                                  set<const llvm::Value *>({zeroValue()})));
+    SeedMap.insert(
+        std::make_pair(&ICF->getFunction(EntryPoint)->front().front(),
+                       set<const llvm::Value *>({getZeroValue()})));
   }
   return SeedMap;
 }

examples/plugins/MyIFDSProblem.h

@@ -7,9 +7,18 @@
 #include <set>
 #include <vector>
 
+namespace psr {
+class ProjectIRDB;
+class LLVMTypeHierarchy;
+class LLVMBasedICFG;
+class LLVMPointsToInfo;
+} // namespace psr
+
 class MyIFDSProblem : public psr::IFDSTabulationProblemPlugin {
 public:
-  MyIFDSProblem(psr::LLVMBasedICFG &I, std::vector<std::string> EntryPoints);
+  MyIFDSProblem(const psr::ProjectIRDB *IRDB, const psr::LLVMTypeHierarchy *TH,
+                const psr::LLVMBasedICFG *ICF, const psr::LLVMPointsToInfo *PT,
+                std::set<std::string> EntryPoints);
   ~MyIFDSProblem() = default;
   std::shared_ptr<psr::FlowFunction<const llvm::Value *>>
   getNormalFlowFunction(const llvm::Instruction *curr,