LLVM: Bump to LLVM 18

mchalupa · Nov 22, 2023 · a8ba793 · a8ba793
1 parent df6e4e2
commit a8ba793
Show file tree

Hide file tree

Showing 9 changed files with 184 additions and 187 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
diff --git a/include/dg/llvm/LLVMSlicer.h b/include/dg/llvm/LLVMSlicer.h
@@ -2,6 +2,7 @@
 #define LLVM_DG_SLICER_H_
 
 #include <llvm/Config/llvm-config.h>
+#include <llvm/IR/Module.h>
 #if ((LLVM_VERSION_MAJOR == 3) && (LLVM_VERSION_MINOR < 5))
 #include <llvm/Support/CFG.h>
 #else
@@ -228,7 +229,7 @@ void sliceCallNode(LLVMNode *callNode, uint32_t slice_id)
 
         Value *fval = graph->getEntry()->getKey();
         Function *F = cast<Function>(fval);
-        F->getBasicBlockList().push_back(block);
+        F->insert(F->end(), block);
 
         // fill in basic block just with return value
         ReturnInst *RI;
@@ -585,7 +586,7 @@ void sliceCallNode(LLVMNode *callNode, uint32_t slice_id)
 
         // set it as a new entry by pusing the block to the front
         // of the list
-        F->getBasicBlockList().push_front(block);
+        F->insert(F->begin(), block);
 
         // FIXME: propagate this change to dependence graph
     }

diff --git a/lib/llvm/LLVMDependenceGraph.cpp b/lib/llvm/LLVMDependenceGraph.cpp
@@ -1,3 +1,4 @@
+#include <llvm/IR/IntrinsicInst.h>
 #include <set>
 #include <unordered_map>
 #include <utility>
@@ -1258,7 +1259,7 @@ void LLVMDependenceGraph::addDefUseEdges(bool preserveDbg) {
                 else if (auto *DI = dyn_cast<DbgValueInst>(&I))
                     val = DI->getValue();
 #if LLVM_VERSION_MAJOR > 5
-                else if (auto *DI = dyn_cast<DbgAddrIntrinsic>(&I))
+                else if (auto *DI = dyn_cast<DbgAssignIntrinsic>(&I))
                     val = DI->getAddress();
 #endif
 

diff --git a/lib/llvm/PointerAnalysis/Constants.cpp b/lib/llvm/PointerAnalysis/Constants.cpp
@@ -106,7 +106,7 @@ Pointer
 LLVMPointerGraphBuilder::handleConstantBitCast(const llvm::CastInst *BC) {
     using namespace llvm;
 
-    if (!BC->isLosslessCast()) {
+    if (!BC->getSrcTy()->canLosslesslyBitCastTo(BC->getDestTy())) {
         // If this is a cast to a bigger type (if that can ever happen?),
         // then preserve the pointer. Otherwise, the pointer is cropped,
         // and there's nothing we can do...

diff --git a/lib/llvm/PointerAnalysis/Globals.cpp b/lib/llvm/PointerAnalysis/Globals.cpp
@@ -76,11 +76,10 @@ void LLVMPointerGraphBuilder::handleGlobalVariableInitializer(
 
 static uint64_t getAllocatedSize(const llvm::GlobalVariable *GV,
                                  const llvm::DataLayout *DL) {
-    llvm::Type *Ty = GV->getType()->getContainedType(0);
-    if (!Ty->isSized())
+    if (!GV->getType()->isSized())
         return 0;
 
-    return DL->getTypeAllocSize(Ty);
+    return DL->getTypeAllocSize(GV->getType());
 }
 
 void LLVMPointerGraphBuilder::buildGlobals() {

diff --git a/lib/llvm/PointerAnalysis/Instructions.cpp b/lib/llvm/PointerAnalysis/Instructions.cpp
@@ -127,7 +127,7 @@ Offset accumulateEVOffsets(const llvm::ExtractValueInst *EV,
         if (llvm::StructType *STy = llvm::dyn_cast<llvm::StructType>(type)) {
             assert(STy->indexValid(idx) && "Invalid index");
             const llvm::StructLayout *SL = DL.getStructLayout(STy);
-            off += SL->getElementOffset(idx);
+            off += SL->getElementOffset(idx).getFixedValue();
         } else {
             // array or vector, so just move in the array
             if (auto *arrTy = llvm::dyn_cast<llvm::ArrayType>(type)) {

diff --git a/lib/llvm/PointerAnalysis/Structure.cpp b/lib/llvm/PointerAnalysis/Structure.cpp
@@ -139,7 +139,7 @@ void LLVMPointerGraphBuilder::addCFGEdges(
     // check whether we created the entry block. If not, we would
     // have a problem while adding successors, so fake that
     // the entry block is the root or the last argument
-    const llvm::BasicBlock *entry = &F->getBasicBlockList().front();
+    const llvm::BasicBlock *entry = &F->front();
     auto it = finfo.llvmBlocks.find(entry);
     if (it != finfo.llvmBlocks.end()) {
         // if we have the entry block, just make it the successor

diff --git a/lib/llvm/ValueRelations/RelationsAnalyzer.cpp b/lib/llvm/ValueRelations/RelationsAnalyzer.cpp
@@ -518,7 +518,8 @@ void RelationsAnalyzer::remGen(ValueRelations &graph,
 
 void RelationsAnalyzer::castGen(ValueRelations &graph,
                                 const llvm::CastInst *cast) {
-    if (cast->isLosslessCast() || cast->isNoopCast(module.getDataLayout()))
+    if (cast->getSrcTy()->canLosslesslyBitCastTo(cast->getDestTy()) ||
+        cast->isNoopCast(module.getDataLayout()))
         graph.setEqual(cast, cast->getOperand(0));
 }
 

diff --git a/tools/include/dg/tools/llvm-slicer.h b/tools/include/dg/tools/llvm-slicer.h
@@ -372,7 +372,7 @@ class ModuleWriter {
                 globals.insert(gv);
         }
 
-        for (GlobalAlias &ga : M->getAliasList()) {
+        for (GlobalAlias &ga : M->aliases()) {
             if (ga.hasNUses(0))
                 aliases.insert(&ga);
         }