Jr/setup

.gitignore

@@ -129,6 +129,7 @@ CMakeCache.txt
 !cmake/*.cmake
 *.pc
 Makefile
+!targets/*/Makefile
 !test/*/Makefile
 
 # Unit test output
@@ -140,3 +141,10 @@ unittests/PhasarLLVM/ifdside/Problems/IFDSTaintAnalysisTest
 unittests/PhasarLLVM/Pointer/LLVMTypeHierarchyTest
 unittests/Utils/LLVMShorthandsTest
 unittests/Utils/PAMMTest
+
+cmake-build*/*
+
+out
+targets/parson/test
+targets/parson/testcpp
+targets/mini/test

CMakeLists.txt

@@ -1,5 +1,5 @@
 cmake_minimum_required (VERSION 3.0)
-
+cmake_policy(SET CMP0060 NEW)
 # Check if we build within the llvm source tree
 if (DEFINED LLVM_MAIN_SRC_DIR)
   set(PHASAR_IN_TREE 1)
@@ -14,6 +14,7 @@ set(CMAKE_EXPORT_COMPILE_COMMANDS YES)
 set(CMAKE_CXX_STANDARD 17)
 set(CMAKE_CXX_STANDARD_REQUIRED ON)
 set(CMAKE_CXX_EXTENSIONS OFF)
+set(CMAKE_VERBOSE_MAKEFILE ON CACHE BOOL "ON")
 
 set_property(GLOBAL PROPERTY TARGET_MESSAGES OFF)
 
@@ -22,9 +23,9 @@ if (NOT CMAKE_BUILD_TYPE)
   default is 'Debug')" FORCE)
 endif ()
 if(CMAKE_BUILD_TYPE STREQUAL "Debug")
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MP -fvisibility-inlines-hidden -fstack-protector-strong -ffunction-sections -fdata-sections -pipe -g")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MP -fvisibility-inlines-hidden -fstack-protector-strong -ffunction-sections -fdata-sections -fno-limit-debug-info -march=native -pipe -g")
 else()
-  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MP -fvisibility-inlines-hidden -fstack-protector-strong -ffunction-sections -fdata-sections -pipe -march=native")
+  set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -MP -fvisibility-inlines-hidden -fstack-protector-strong -ffunction-sections -fdata-sections -fno-limit-debug-info -pipe -march=native")
 endif()
 
 # Enable testing
@@ -135,6 +136,7 @@ if (NOT PHASAR_IN_TREE)
   find_package(LLVM 10 REQUIRED CONFIG)
   include_directories(${LLVM_INCLUDE_DIRS})
   link_directories(${LLVM_LIB_PATH} ${LLVM_LIBRARY_DIRS})
+  message("Lib: ${LLVM_LIB_PATH} | ${LLVM_INCLUDE_DIRS} | ${LLVM_LIBRARY_DIRS}")
 endif()
 
 add_definitions(${LLVM_DEFINITIONS})
@@ -178,7 +180,8 @@ if(PHASAR_IN_TREE OR NEED_LIBCLANG_COMPONENT_LIBS)
     clangASTMatchers
     clangLex
     clangBasic
-    LLVMFrontendOpenMP)
+    LLVMFrontendOpenMP
+          )
 endif()
 if (NOT PHASAR_IN_TREE)
   # Only search for clang if we build out of tree
@@ -229,6 +232,7 @@ llvm_map_components_to_libnames(llvm_libs
   ${LLVM_LINK_COMPONENTS}
 )
 
+
 # phasar-based binaries
 add_subdirectory(tools)
 

bootstrap.sh

@@ -6,7 +6,7 @@ readonly PHASAR_INSTALL_DIR="/usr/local/phasar"
 readonly LLVM_INSTALL_DIR="/usr/local/llvm-10"
 
 NUM_THREADS=$(nproc)
-LLVM_RELEASE=llvmorg-10.0.0
+LLVM_RELEASE=llvmorg-10.0.1
 DO_UNIT_TEST=false
 
 

include/phasar/PhasarLLVM/ControlFlow/LLVMBasedCFG.h

@@ -17,7 +17,10 @@
 #ifndef PHASAR_PHASARLLVM_CONTROLFLOW_LLVMBASEDCFG_H_
 #define PHASAR_PHASARLLVM_CONTROLFLOW_LLVMBASEDCFG_H_
 
+#include <map>
+
 #include <iostream>
+
 #include <set>
 #include <string>
 #include <vector>
@@ -27,6 +30,7 @@
 namespace llvm {
 class Function;
 class Instruction;
+class BasicBlock;
 } // namespace llvm
 
 namespace psr {
@@ -71,6 +75,15 @@ class LLVMBasedCFG
 
   [[nodiscard]] bool isFieldStore(const llvm::Instruction *Stmt) const override;
 
+  static std::map<const llvm::BasicBlock *, std::set<const llvm::BasicBlock *>>
+  getNonTerminationSensitiveControlDependence(const llvm::Function &fun);
+
+  static std::map<const llvm::BasicBlock *, std::set<const llvm::BasicBlock *>>
+  getNonTerminationInsensitiveControlDependence(const llvm::Function &fun);
+
+  static std::map<const llvm::BasicBlock *, std::set<const llvm::BasicBlock *>>
+  getDecisiveControlDependence(const llvm::Function &fun);
+
   [[nodiscard]] bool
   isFallThroughSuccessor(const llvm::Instruction *Stmt,
                          const llvm::Instruction *succ) const override;

include/phasar/Utils/LLVMIRToSrc.h

@@ -46,7 +46,7 @@ unsigned int getColumnFromIR(const llvm::Value *V);
 std::string getSrcCodeFromIR(const llvm::Value *V);
 
 std::string getModuleIDFromIR(const llvm::Value *V);
-
+unsigned int getFunctionHeaderLines(const llvm::Value *V);
 } // namespace psr
 
 #endif

lib/DB/CMakeLists.txt

@@ -4,6 +4,7 @@ include_directories(
   ${SQLITE3_INCLUDE_DIR}
 )
 
+
 set(PHASAR_LINK_LIBS
   phasar_pointer
   phasar_typehierarchy

lib/DB/DBConn.cpp

@@ -553,7 +553,11 @@ bool DBConn::insertModule(const string &ProjectName,
     string identifier(module->getModuleIdentifier());
     string ir_mod_buffer;
     llvm::raw_string_ostream rso(ir_mod_buffer);
+     #if LLVM_VERSION_MAJOR < 7
     llvm::WriteBitcodeToFile(module, rso);
+    #else
+    llvm::WriteBitcodeToFile(*module, rso);
+    #endif
     rso.flush();
     istringstream ist(ir_mod_buffer);
     size_t hash_value = hash<string>()(ir_mod_buffer);

lib/DB/ProjectIRDB.cpp

@@ -10,6 +10,7 @@
 #include <algorithm>
 #include <cassert>
 #include <iostream>
+
 #include <string>
 
 #include "llvm/Bitcode/BitcodeReader.h"
@@ -39,6 +40,7 @@
 #include "phasar/Utils/PAMMMacros.h"
 #include "phasar/Utils/Utilities.h"
 
+
 using namespace psr;
 using namespace std;
 
@@ -61,10 +63,7 @@ ProjectIRDB::ProjectIRDB(const std::vector<std::string> &IRFiles,
     : ProjectIRDB(Options | IRDBOptions::OWNS) {
   for (const auto &File : IRFiles) {
     // if we have a file that is already compiled to llvm ir
-    if ((File.find(".ll") != std::basic_string<char, std::char_traits<char>,
-                                               std::allocator<char>>::npos ||
-         File.find(".bc") != std::basic_string<char, std::char_traits<char>,
-                                               std::allocator<char>>::npos) &&
+    if ((File.find(".ll") != File.npos || File.find(".bc") != File.npos) &&
         boost::filesystem::exists(File)) {
       llvm::SMDiagnostic Diag;
       std::unique_ptr<llvm::LLVMContext> C(new llvm::LLVMContext);