Bump LLVM to Version 18

Author: zhixiao-zhang

build.sh

@@ -23,11 +23,11 @@ SCRIPT_DIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
 SVFHOME="${SCRIPT_DIR}"
 sysOS=$(uname -s)
 arch=$(uname -m)
-MajorLLVMVer=16
-LLVMVer=${MajorLLVMVer}.0.4
-UbuntuArmLLVM_RTTI="https://github.com/SVF-tools/SVF/releases/download/SVF-3.1/llvm-${MajorLLVMVer}.0.0-ubuntu22-rtti-aarch64.tar.gz"
+MajorLLVMVer=18
+LLVMVer=${MajorLLVMVer}.1.0
+UbuntuArmLLVM_RTTI="https://github.com/SVF-tools/SVF/releases/download/SVF-3.1/llvm-${MajorLLVMVer}.1.0-ubuntu22-rtti-aarch64.tar.gz"
 UbuntuArmLLVM="https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVMVer}/clang+llvm-${LLVMVer}-aarch64-linux-gnu.tar.xz"
-UbuntuLLVM_RTTI="https://github.com/SVF-tools/SVF/releases/download/SVF-3.1/llvm-${MajorLLVMVer}.0.0-ubuntu20-rtti-x86-64.tar.gz"
+UbuntuLLVM_RTTI="https://github.com/SVF-tools/SVF/releases/download/SVF-3.1/llvm-${MajorLLVMVer}.1.0-ubuntu20-rtti-x86-64.tar.gz"
 UbuntuLLVM="https://github.com/llvm/llvm-project/releases/download/llvmorg-${LLVMVer}/clang+llvm-${LLVMVer}-x86_64-linux-gnu-ubuntu-22.04.tar.xz"
 SourceLLVM="https://github.com/llvm/llvm-project/archive/refs/tags/llvmorg-${LLVMVer}.zip"
 UbuntuZ3="https://github.com/Z3Prover/z3/releases/download/z3-4.8.8/z3-4.8.8-x64-ubuntu-16.04.zip"
@@ -36,7 +36,7 @@ SourceZ3="https://github.com/Z3Prover/z3/archive/refs/tags/z3-4.8.8.zip"
 
 # Keep LLVM version suffix for version checking and better debugging
 # keep the version consistent with LLVM_DIR in setup.sh and llvm_version in Dockerfile
-LLVMHome="llvm-${MajorLLVMVer}.0.0.obj"
+LLVMHome="llvm-${LLVMVer}.obj"
 Z3Home="z3.obj"
 
 
@@ -311,4 +311,4 @@ source ${SVFHOME}/setup.sh ${BUILD_TYPE}
 #########
 # Optionally, you can also specify a CXX_COMPILER and your $LLVM_HOME for your build
 # cmake -DCMAKE_CXX_COMPILER=$LLVM_DIR/bin/clang++ -DLLVM_DIR=$LLVM_DIR
-#########
+#########

svf-llvm/CMakeLists.txt

@@ -49,7 +49,22 @@ add_definitions(${_LLVM_DEFINITIONS})
 if(LLVM_LINK_LLVM_DYLIB)
   set(LLVM_LIBRARIES LLVM)
 else()
-  llvm_map_components_to_libnames(LLVM_LIBRARIES all)
+  llvm_map_components_to_libnames(LLVM_LIBRARIES
+    analysis
+    bitwriter
+    core
+    instcombine
+    instrumentation
+    ipo
+    irreader
+    linker
+    scalaropts
+    support
+    target
+    transformutils
+    demangle
+    Passes
+  )
 endif()
 
 # Search in the executables dir for this LLVM's clang instance

svf-llvm/include/SVF-LLVM/BasicTypes.h

@@ -72,8 +72,10 @@ typedef llvm::GlobalObject GlobalObject;
 typedef llvm::Use Use;
 typedef llvm::ModulePass ModulePass;
 typedef llvm::IRBuilder<> IRBuilder;
-#if LLVM_VERSION_MAJOR >= 12
+#if LLVM_VERSION_MAJOR >= 12 && LLVM_VERSION_MAJOR <= 16
 typedef llvm::UnifyFunctionExitNodesLegacyPass UnifyFunctionExitNodes;
+#elif LLVM_VERSION_MAJOR > 16
+typedef llvm::UnifyFunctionExitNodesPass UnifyFunctionExitNodes;
 #else
 typedef llvm::UnifyFunctionExitNodes UnifyFunctionExitNodes;
 #endif

svf-llvm/include/SVF-LLVM/BreakConstantExpr.h

@@ -15,6 +15,10 @@
 #ifndef BREAKCONSTANTGEPS_H
 #define BREAKCONSTANTGEPS_H
 
+#if LLVM_VERSION_MAJOR > 16
+  #include "llvm/Passes/PassBuilder.h"
+  #include "llvm/Transforms/Utils/UnifyFunctionExitNodes.h"
+#endif
 
 namespace SVF
 {
@@ -77,6 +81,25 @@ class MergeFunctionRets : public ModulePass
             const Function& fun = *iter;
             if(fun.isDeclaration())
                 continue;
+#if LLVM_VERSION_MAJOR > 16
+            llvm::PassBuilder PB;
+            llvm::LoopAnalysisManager LAM;
+            llvm::FunctionAnalysisManager FAM;
+            llvm::CGSCCAnalysisManager CGAM;
+            llvm::ModuleAnalysisManager MAM;
+
+            PB.registerModuleAnalyses(MAM);
+            PB.registerCGSCCAnalyses(CGAM);
+            PB.registerFunctionAnalyses(FAM);
+            PB.registerLoopAnalyses(LAM);
+            PB.crossRegisterProxies(LAM, FAM, CGAM, MAM);
+
+            llvm::FunctionPassManager FPM;
+            FPM.addPass(llvm::UnifyFunctionExitNodesPass());
+            FPM.run(const_cast<llvm::Function&>(fun), FAM);
+        }
+    }
+#else
             getUnifyExit(fun)->runOnFunction(const_cast<Function&>(fun));
         }
     }
@@ -86,6 +109,7 @@ class MergeFunctionRets : public ModulePass
         assert(!fn.isDeclaration() && "external function does not have DF");
         return &getAnalysis<UnifyFunctionExitNodes>(const_cast<Function&>(fn));
     }
+#endif
 };
 
 } // End namespace SVF

svf-llvm/lib/LLVMModule.cpp

@@ -45,6 +45,10 @@
 #include "Graphs/CallGraph.h"
 #include "Util/CallGraphBuilder.h"
 
+#if LLVM_VERSION_MAJOR > 16
+#include <llvm/Passes/PassBuilder.h>
+#endif
+
 using namespace std;
 using namespace SVF;
 
@@ -267,7 +271,23 @@ void LLVMModuleSet::prePassSchedule()
             Function &fun = *F;
             if (fun.isDeclaration())
                 continue;
+#if LLVM_VERSION_MAJOR <= 16
             p2->runOnFunction(fun);
+#else
+            llvm::PassBuilder PB;
+            llvm::LoopAnalysisManager LAM;
+            llvm::FunctionAnalysisManager FAM;
+            llvm::CGSCCAnalysisManager CGAM;
+            llvm::ModuleAnalysisManager MAM;
+            PB.registerModuleAnalyses(MAM);
+            PB.registerCGSCCAnalyses(CGAM);
+            PB.registerFunctionAnalyses(FAM);
+            PB.registerLoopAnalyses(LAM);
+            PB.crossRegisterProxies(LAM, FAM, CGAM, MAM);
+            llvm::FunctionPassManager FPM;
+            // FPM.addPass(llvm::UnifyFunctionExitNodesPass());
+            FPM.run(fun, FAM);
+#endif
         }
     }
 }

svf-llvm/lib/LLVMUtil.cpp

@@ -461,7 +461,11 @@ const std::string LLVMUtil::getSourceLoc(const Value* val )
     {
         if (SVFUtil::isa<AllocaInst>(inst))
         {
+#if LLVM_VERSION_MAJOR > 16
+            for (llvm::DbgInfoIntrinsic *DII : llvm::findDbgDeclares(const_cast<Instruction*>(inst)))
+#else
             for (llvm::DbgInfoIntrinsic *DII : FindDbgDeclareUses(const_cast<Instruction*>(inst)))
+#endif
             {
                 if (llvm::DbgDeclareInst *DDI = SVFUtil::dyn_cast<llvm::DbgDeclareInst>(DII))
                 {

svf-llvm/lib/SVFIRBuilder.cpp

@@ -276,7 +276,11 @@ void SVFIRBuilder::initDomTree(FunObjVar* svffun, const Function* fun)
     for (DominanceFrontierBase::const_iterator dfIter = df.begin(), eDfIter = df.end(); dfIter != eDfIter; dfIter++)
     {
         const BasicBlock* keyBB = dfIter->first;
+#if LLVM_VERSION_MAJOR > 16
+        const llvm::SetVector<llvm::BasicBlock* >& domSet = dfIter->second;
+#else
         const std::set<BasicBlock* >& domSet = dfIter->second;
+#endif
         Set<const SVFBasicBlock*>& valueBasicBlocks = dfBBsMap[llvmModuleSet()->getSVFBasicBlock(keyBB)];
         for (const BasicBlock* bbValue:domSet)
         {