add LLVM 14 support, fix API change breakage

Martin Mory · Martin Mory · commit ad18049b45b6 · 2022-04-04T15:07:43.000+02:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -179,7 +179,7 @@ include_directories(${SQLITE3_INCLUDE_DIR})
 # LLVM
 if (NOT PHASAR_IN_TREE)
   # Only search for LLVM if we build out of tree
-  find_package(LLVM 13 REQUIRED CONFIG)
+  find_package(LLVM 14 REQUIRED CONFIG)
   include_directories(${LLVM_INCLUDE_DIRS})
   link_directories(${LLVM_LIB_PATH} ${LLVM_LIBRARY_DIRS})
 endif()
diff --git a/Config.cmake.in b/Config.cmake.in
@@ -9,7 +9,7 @@ foreach(component ${phasar_FIND_COMPONENTS})
 endforeach()
 
 function(phasar_config executable)
-  find_package(LLVM 13 REQUIRED CONFIG)
+  find_package(LLVM 14 REQUIRED CONFIG)
   include_directories(${LLVM_INCLUDE_DIRS})
   link_directories(${LLVM_LIB_PATH} ${LLVM_LIBRARY_DIRS})
   find_library(LLVM_LIBRARY NAMES LLVM HINTS ${LLVM_LIBRARY_DIRS})
diff --git a/README.md b/README.md
@@ -20,7 +20,7 @@ PhASAR requires C++-17.
 
 Currently supported version of LLVM
 -----------------------------------
-PhASAR is currently set up to support LLVM-13.0.
+PhASAR is currently set up to support LLVM-14.0.
 
 What is PhASAR?
 ---------------
diff --git a/bootstrap.sh b/bootstrap.sh
@@ -5,10 +5,10 @@ source ./utils/safeCommandsSet.sh
 
 readonly PHASAR_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 readonly PHASAR_INSTALL_DIR="/usr/local/phasar"
-readonly LLVM_INSTALL_DIR="/usr/local/llvm-13"
+readonly LLVM_INSTALL_DIR="/usr/local/llvm-14"
 
 NUM_THREADS=$(nproc)
-LLVM_RELEASE=llvmorg-13.0.0
+LLVM_RELEASE=llvmorg-14.0.0
 DO_UNIT_TEST=true
 
 
diff --git a/lib/PhasarLLVM/ControlFlow/Resolver/OTFResolver.cpp b/lib/PhasarLLVM/ControlFlow/Resolver/OTFResolver.cpp
@@ -261,12 +261,11 @@ std::vector<std::pair<const llvm::Value *, const llvm::Value *>>
 OTFResolver::getActualFormalPointerPairs(const llvm::CallBase *CallSite,
                                          const llvm::Function *CalleeTarget) {
   std::vector<std::pair<const llvm::Value *, const llvm::Value *>> Pairs;
-  Pairs.reserve(CallSite->getNumArgOperands());
+  Pairs.reserve(CallSite->arg_size());
   // ordinary case
 
   unsigned Idx = 0;
-  for (; Idx < CallSite->getNumArgOperands() && Idx < CalleeTarget->arg_size();
-       ++Idx) {
+  for (; Idx < CallSite->arg_size() && Idx < CalleeTarget->arg_size(); ++Idx) {
     // only collect pointer typed pairs
     if (CallSite->getArgOperand(Idx)->getType()->isPointerTy() &&
         CalleeTarget->getArg(Idx)->getType()->isPointerTy()) {
@@ -297,7 +296,7 @@ OTFResolver::getActualFormalPointerPairs(const llvm::CallBase *CallSite,
     }
 
     if (VarArgs) {
-      for (; Idx < CallSite->getNumArgOperands(); ++Idx) {
+      for (; Idx < CallSite->arg_size(); ++Idx) {
         if (CallSite->getArgOperand(Idx)->getType()->isPointerTy()) {
           Pairs.emplace_back(CallSite->getArgOperand(Idx), VarArgs);
         }
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/IFDSFieldSensTaintAnalysis/Utils/DataFlowUtils.cpp
@@ -758,7 +758,7 @@ DataFlowUtils::getSanitizedArgList(const llvm::CallInst *CallInst,
                  const llvm::Value *>>
       SanitizedArgList;
 
-  for (unsigned I = 0; I < CallInst->getNumArgOperands(); ++I) {
+  for (unsigned I = 0; I < CallInst->arg_size(); ++I) {
     auto *const Arg = CallInst->getOperand(I);
     const auto *const Param = getNthFunctionArgument(DestFun, I);
 
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEExtendedTaintAnalysis.cpp
@@ -440,8 +440,7 @@ IDEExtendedTaintAnalysis::getRetFlowFunction(n_t CallSite, f_t CalleeFun,
   const auto *Call = llvm::cast<llvm::CallBase>(CallSite);
   return makeLambdaFlow<d_t>([this, Call, CalleeFun,
                               ExitStmt{llvm::cast<llvm::ReturnInst>(ExitStmt)},
-                              PTC{ArgPointsToCache(PT,
-                                                   Call->getNumArgOperands(),
+                              PTC{ArgPointsToCache(PT, Call->arg_size(),
                                                    HasPrecisePointsToInfo)}](
                                  d_t Source) -> std::set<d_t> {
     if (isZeroValue(Source)) {
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/IDEGeneralizedLCA.cpp
@@ -398,8 +398,8 @@ IDEGeneralizedLCA::getCallEdgeFunction(IDEGeneralizedLCA::n_t CallStmt,
                                        IDEGeneralizedLCA::d_t DestNode) {
   const auto *CallSite = llvm::cast<llvm::CallBase>(CallStmt);
   if (isZeroValue(SrcNode)) {
-    auto Len = std::min<size_t>(CallSite->getNumArgOperands(),
-                                DestinationMethod->arg_size());
+    auto Len =
+        std::min<size_t>(CallSite->arg_size(), DestinationMethod->arg_size());
     for (size_t I = 0; I < Len; ++I) {
       const auto *FormalArg = getNthFunctionArgument(DestinationMethod, I);
       if (DestNode == FormalArg) {
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCalleeFlowFunction.cpp
@@ -23,7 +23,7 @@ namespace psr {
 MapFactsToCalleeFlowFunction::MapFactsToCalleeFlowFunction(
     const llvm::CallBase *CallSite, const llvm::Function *Callee)
     : CallSite(CallSite), Callee(Callee) {
-  for (unsigned Idx = 0; Idx < CallSite->getNumArgOperands(); ++Idx) {
+  for (unsigned Idx = 0; Idx < CallSite->arg_size(); ++Idx) {
     Actuals.push_back(CallSite->getArgOperand(Idx));
   }
   // Set up the formal parameters
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDEGeneralizedLCA/MapFactsToCallerFlowFunction.cpp
@@ -22,7 +22,7 @@ MapFactsToCallerFlowFunction::MapFactsToCallerFlowFunction(
     const llvm::Function *Callee)
     : CallSite(CallSite), ExitStmt(llvm::cast<llvm::ReturnInst>(ExitStmt)),
       Callee(Callee) {
-  for (unsigned Idx = 0; Idx < CallSite->getNumArgOperands(); ++Idx) {
+  for (unsigned Idx = 0; Idx < CallSite->arg_size(); ++Idx) {
     Actuals.push_back(CallSite->getArgOperand(Idx));
   }
   // Set up the formal parameters
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDELinearConstantAnalysis.cpp
@@ -126,7 +126,7 @@ IDELinearConstantAnalysis::getCallFlowFunction(n_t CallSite, f_t DestFun) {
       const llvm::Function *DestFun;
       LCAFF(const llvm::CallBase *CallSite, f_t DestFun) : DestFun(DestFun) {
         // std::set up the actual parameters
-        for (unsigned Idx = 0; Idx < CallSite->getNumArgOperands(); ++Idx) {
+        for (unsigned Idx = 0; Idx < CallSite->arg_size(); ++Idx) {
           Actuals.push_back(CallSite->getArgOperand(Idx));
         }
         // std::set up the formal parameters
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IDETypeStateAnalysis.cpp
@@ -176,7 +176,7 @@ IDETypeStateAnalysis::getRetFlowFunction(
           ExitSite(llvm::dyn_cast<llvm::ReturnInst>(ExitSite)),
           Analysis(Analysis) {
       // Set up the actual parameters
-      for (unsigned Idx = 0; Idx < CallSite->getNumArgOperands(); ++Idx) {
+      for (unsigned Idx = 0; Idx < CallSite->arg_size(); ++Idx) {
         Actuals.push_back(CallSite->getArgOperand(Idx));
       }
       // Set up the formal parameters
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSTaintAnalysis.cpp
@@ -216,7 +216,7 @@ IFDSTaintAnalysis::getCallToRetFlowFunction(
   if (HasBody && Gen.empty() && Leak.empty() && Kill.empty()) {
     // We have a normal function-call and the ret-FF is responsible for handling
     // pointer parameters. So we need to kill them here
-    for (const auto &Arg : CS->arg_operands()) {
+    for (const auto &Arg : CS->args()) {
       if (Arg->getType()->isPointerTy()) {
         Kill.insert(Arg.get());
       }
diff --git a/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.cpp b/lib/PhasarLLVM/DataFlowSolver/IfdsIde/Problems/IFDSUninitializedVariables.cpp
@@ -253,7 +253,7 @@ IFDSUninitializedVariables::getCallFlowFunction(
            const llvm::Value *ZV)
           : DestFun(DM), CallSite(CallSite), Zerovalue(ZV) {
         // set up the actual parameters
-        for (unsigned Idx = 0; Idx < CallSite->getNumArgOperands(); ++Idx) {
+        for (unsigned Idx = 0; Idx < CallSite->arg_size(); ++Idx) {
           Actuals.push_back(CallSite->getArgOperand(Idx));
         }
         // set up the formal parameters
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoFullConstantPropagation.cpp b/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoFullConstantPropagation.cpp
@@ -79,13 +79,13 @@ InterMonoFullConstantPropagation::callFlow(
       llvm::isa<llvm::InvokeInst>(CallSite)) {
     const auto *CS = llvm::cast<llvm::CallBase>(CallSite);
     // early exit; varargs not handled yet
-    if (CS->getNumArgOperands() == 0 || Callee->isVarArg()) {
+    if (CS->arg_size() == 0 || Callee->isVarArg()) {
       return Out;
     }
     vector<const llvm::Value *> Actuals;
     vector<const llvm::Value *> Formals;
     // Set up the actual parameters
-    for (unsigned Idx = 0; Idx < CS->getNumArgOperands(); ++Idx) {
+    for (unsigned Idx = 0; Idx < CS->arg_size(); ++Idx) {
       Actuals.push_back(CS->getArgOperand(Idx));
     }
     // Set up the formal parameters
diff --git a/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.cpp b/lib/PhasarLLVM/DataFlowSolver/Mono/Problems/InterMonoTaintAnalysis.cpp
@@ -166,7 +166,7 @@ InterMonoTaintAnalysis::mono_container_t InterMonoTaintAnalysis::callToRetFlow(
   Out.insert(Gen);
   if (Gen.empty() && Kill.empty()) {
     // erase pointer arguments, since they are now propagated in the retFF
-    for (unsigned Idx = 0; Idx < CS->getNumArgOperands(); ++Idx) {
+    for (unsigned Idx = 0; Idx < CS->arg_size(); ++Idx) {
       if (CS->getArgOperand(Idx)->getType()->isPointerTy()) {
         Out.erase(CS->getArgOperand(Idx));
       }
diff --git a/lib/PhasarLLVM/Plugins/AnalysisPluginController.cpp b/lib/PhasarLLVM/Plugins/AnalysisPluginController.cpp
@@ -42,7 +42,7 @@ AnalysisPluginController::AnalysisPluginController(
     boost::dll::shared_library SharedLib(LibPath,
                                          boost::dll::load_mode::rtld_lazy, Err);
     if (Err) {
-      llvm::report_fatal_error(Err.message());
+      llvm::report_fatal_error(Err.message().c_str());
     }
     // if (!IDETabulationProblemPluginFactory.empty()) {
     //   for (auto Problem : IDETabulationProblemPluginFactory) {
diff --git a/lib/PhasarLLVM/Utils/Annotation.cpp b/lib/PhasarLLVM/Utils/Annotation.cpp
@@ -14,6 +14,7 @@
 #include "llvm/IR/Argument.h"
 #include "llvm/IR/Constants.h"
 #include "llvm/IR/Function.h"
+#include "llvm/IR/GetElementPtrTypeIterator.h"
 #include "llvm/IR/GlobalVariable.h"
 #include "llvm/IR/InstrTypes.h"
 #include "llvm/IR/Instructions.h"
@@ -55,7 +56,8 @@ uint64_t VarAnnotation::getLine() const {
 llvm::StringRef VarAnnotation::retrieveString(unsigned Idx) const {
   if (const auto *ConstExpr = llvm::dyn_cast<llvm::ConstantExpr>(
           AnnotationCall->getArgOperand(Idx))) {
-    if (ConstExpr->isGEPWithNoNotionalOverIndexing()) {
+    if (true // ConstExpr->isGEPWithNoNotionalOverIndexing()
+    ) {
       if (const auto *GlobalVar =
               llvm::dyn_cast<llvm::GlobalVariable>(ConstExpr->getOperand(0))) {
         if (GlobalVar->hasInitializer()) {
@@ -109,7 +111,8 @@ llvm::StringRef GlobalAnnotation::retrieveString(unsigned Idx) const {
   const auto *AnnotationGepOp = AnnotationStruct->getOperand(Idx);
   if (const auto *ConstExpr =
           llvm::dyn_cast<llvm::ConstantExpr>(AnnotationGepOp)) {
-    if (ConstExpr->isGEPWithNoNotionalOverIndexing()) {
+    if (true // ConstExpr->isGEPWithNoNotionalOverIndexing()
+    ) {
       if (const auto *GlobalVar =
               llvm::dyn_cast<llvm::GlobalVariable>(ConstExpr->getOperand(0))) {
         if (GlobalVar->hasInitializer()) {
diff --git a/lib/PhasarPass/PhasarPass.cpp b/lib/PhasarPass/PhasarPass.cpp
@@ -59,8 +59,8 @@ bool PhasarPass::runOnModule(llvm::Module &M) {
   // check if the requested entry points exist
   for (const std::string &EP : EntryPoints) {
     if (!DB.getFunctionDefinition(EP)) {
-      llvm::report_fatal_error("psr error: entry point does not exist '" + EP +
-                               "'");
+      llvm::report_fatal_error(
+          ("psr error: entry point does not exist '" + EP + "'").c_str());
     }
     EntryPointsSet.insert(EP);
   }
diff --git a/tools/phasar-llvm/phasar-llvm.cpp b/tools/phasar-llvm/phasar-llvm.cpp
@@ -346,7 +346,7 @@ int main(int Argc, const char **Argv) {
       boost::system::error_code Err;
       PluginLibs.emplace_back(LibPath, boost::dll::load_mode::rtld_lazy, Err);
       if (Err) {
-        llvm::report_fatal_error(Err.message());
+        llvm::report_fatal_error(Err.message().c_str());
       }
     }
     // check what plugins have registed themselves and add those to the vector

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ namespace psr {`
`23`	`23`	`MapFactsToCalleeFlowFunction::MapFactsToCalleeFlowFunction(`
`24`	`24`	`const llvm::CallBase CallSite, const llvm::Function Callee)`
`25`	`25`	`: CallSite(CallSite), Callee(Callee) {`
`26`		`- for (unsigned Idx = 0; Idx < CallSite->getNumArgOperands(); ++Idx) {`
	`26`	`+ for (unsigned Idx = 0; Idx < CallSite->arg_size(); ++Idx) {`
`27`	`27`	`Actuals.push_back(CallSite->getArgOperand(Idx));`
`28`	`28`	`}`
`29`	`29`	`// Set up the formal parameters`
Original file line number	Diff line number	Diff line change
`@@ -22,7 +22,7 @@ MapFactsToCallerFlowFunction::MapFactsToCallerFlowFunction(`
`22`	`22`	`const llvm::Function *Callee)`
`23`	`23`	`: CallSite(CallSite), ExitStmt(llvm::cast<llvm::ReturnInst>(ExitStmt)),`
`24`	`24`	`Callee(Callee) {`
`25`		`- for (unsigned Idx = 0; Idx < CallSite->getNumArgOperands(); ++Idx) {`
	`25`	`+ for (unsigned Idx = 0; Idx < CallSite->arg_size(); ++Idx) {`
`26`	`26`	`Actuals.push_back(CallSite->getArgOperand(Idx));`
`27`	`27`	`}`
`28`	`28`	`// Set up the formal parameters`