Fix new deprecations and changes for LLVM 23

Author: thewilsonator

driver/cl_options-llvm.cpp

@@ -72,7 +72,11 @@ std::string getFeaturesStr() {
 
 void setFunctionAttributes(StringRef cpu, StringRef features,
                            Function &function) {
+#if LLVM_VERSION_MAJOR >= 23
+  return codegen::setFunctionAttributes(function, cpu, features);
+#else
   return codegen::setFunctionAttributes(cpu, features, function);
+#endif
 }
 } // namespace opts
 

gen/arrays.cpp

@@ -89,7 +89,7 @@ static void DtoArrayInit(Loc loc, LLValue *ptr, LLValue *length,
 
   // move into the for condition block, ie. start the loop
   assert(!gIR->scopereturned());
-  llvm::BranchInst::Create(condbb, gIR->scopebb());
+  createBranch(condbb, gIR->scopebb());
 
   // replace current scope
   gIR->ir->SetInsertPoint(condbb);
@@ -101,7 +101,7 @@ static void DtoArrayInit(Loc loc, LLValue *ptr, LLValue *length,
 
   // conditional branch
   assert(!gIR->scopereturned());
-  llvm::BranchInst::Create(bodybb, endbb, cond_val, gIR->scopebb());
+  createBranch(cond_val, bodybb, endbb, gIR->scopebb());
 
   // rewrite scope
   gIR->ir->SetInsertPoint(bodybb);
@@ -117,7 +117,7 @@ static void DtoArrayInit(Loc loc, LLValue *ptr, LLValue *length,
            itr);
 
   // loop
-  llvm::BranchInst::Create(condbb, gIR->scopebb());
+  createBranch(condbb, gIR->scopebb());
 
   // rewrite the scope
   gIR->ir->SetInsertPoint(endbb);

gen/classes.cpp

@@ -221,7 +221,7 @@ void DtoFinalizeScopeClass(Loc loc, DValue *dval,
   const auto hasMonitor =
       gIR->ir->CreateICmp(llvm::CmpInst::ICMP_NE, monitor,
                           getNullValue(monitor->getType()), ".hasMonitor");
-  llvm::BranchInst::Create(ifbb, endbb, hasMonitor, gIR->scopebb());
+  createBranch(hasMonitor, ifbb, endbb, gIR->scopebb());
 
   gIR->ir->SetInsertPoint(ifbb);
   DtoFinalizeClass(loc, inst);

gen/llvmhelpers.cpp

@@ -1364,7 +1364,11 @@ void printLabelName(std::ostream &target, const char *func_mangle,
                     const char *label_name) {
   // note: quotes needed for Unicode
   target << '"'
+#if LLVM_VERSION_MAJOR >= 23
+         << gTargetMachine->getMCAsmInfo()->getPrivateLabelPrefix().str()
+#else
          << gTargetMachine->getMCAsmInfo()->getPrivateGlobalPrefix().str()
+#endif
          << func_mangle << "_" << label_name << '"';
 }
 
@@ -1431,6 +1435,24 @@ LLValue *createIPairCmp(EXP op, LLValue *lhs1, LLValue *lhs2, LLValue *rhs1,
   return r;
 }
 
+llvm::Instruction *createBranch(LLValue* cond,
+                                llvm::BasicBlock * _if,
+                                llvm::BasicBlock * _else,
+                                llvm::BasicBlock *insertAfter) {
+#if LLVM_VERSION_MAJOR >= 23
+  return llvm::CondBrInst::Create(cond, _if, _else, insertAfter);
+#else
+  return llvm::BranchInst::Create(_if, _else, cond, insertAfter);
+#endif
+}
+llvm::Instruction *createBranch(llvm::BasicBlock *label, llvm::BasicBlock *insertAfter) {
+#if LLVM_VERSION_MAJOR >= 23
+  return llvm::UncondBrInst::Create(label, insertAfter);
+#else
+  return llvm::BranchInst::Create(label, insertAfter);
+#endif
+}
+
 ///////////////////////////////////////////////////////////////////////////////
 DValue *DtoSymbolAddress(Loc loc, Type *type, Declaration *decl) {
   IF_LOG Logger::println("DtoSymbolAddress ('%s' of type '%s')",

gen/llvmhelpers.h

@@ -186,6 +186,11 @@ llvm::ICmpInst::Predicate eqTokToICmpPred(EXP op, bool invert = false);
 /// `(lhs1 != rhs1) | (lhs2 != rhs2)` for inequality/not-identity.
 LLValue *createIPairCmp(EXP op, LLValue *lhs1, LLValue *lhs2, LLValue *rhs1,
                         LLValue *rhs2);
+llvm::Instruction *createBranch(LLValue* cond,
+                                llvm::BasicBlock * _if,
+                                llvm::BasicBlock * _else,
+                                llvm::BasicBlock *insertAfter = nullptr);
+llvm::Instruction *createBranch(llvm::BasicBlock *label, llvm::BasicBlock *insertAfter = nullptr);
 
 ////////////////////////////////////////////
 // gen/tocall.cpp stuff below

gen/ms-cxx-helper.cpp

@@ -107,7 +107,7 @@ void cloneBlocks(const std::vector<llvm::BasicBlock *> &srcblocks,
               CInst, llvm::OperandBundleDef("funclet", funclet));
           newInst = call;
         } else if (funclet && llvm::isa<llvm::UnreachableInst>(Inst)) {
-          newInst = llvm::BranchInst::Create(continueWith); // to cleanupret
+          newInst = createBranch(continueWith);
         }
       }
       if (!newInst)

gen/optimizer.cpp

@@ -194,8 +194,13 @@ static OptimizationLevel getOptimizationLevel(){
     case 3:
     case 4:
     case 5: return OptimizationLevel::O3;
+#if LLVM_VERSION_MAJOR >= 23
+    case -1: return OptimizationLevel::O2;
+    case -2: return OptimizationLevel::O2;
+#else
     case -1: return OptimizationLevel::Os;
     case -2: return OptimizationLevel::Oz;
+#endif
   }
   //This should never be reached
   llvm_unreachable("Unexpected optimizeLevel.");

gen/passes/GarbageCollect2Stack.cpp

@@ -351,13 +351,13 @@ static void RemoveCall(CallBase *CB, const G2StackAnalysis &A) {
   // immediately before it. Ideally, we would find a way to not invalidate
   // the dominator tree here.
   if (auto Invoke = dyn_cast<InvokeInst>(static_cast<Instruction *>(CB))) {
-    BranchInst::Create(Invoke->getNormalDest(),
-#if LLVM_VERSION_MAJOR >= 19
-                       Invoke->getIterator()
+#if   LLVM_VERSION_MAJOR >= 23
+    UncondBrInst::Create(Invoke->getNormalDest(), Invoke->getIterator());
+#elif LLVM_VERSION_MAJOR >= 19
+    BranchInst::Create(Invoke->getNormalDest(), Invoke->getIterator());
 #else
-                       Invoke
+    BranchInst::Create(Invoke->getNormalDest(), Invoke);
 #endif
-    );
     Invoke->getUnwindDest()->removePredecessor(CB->getParent());
   }