update to LLVM 21.1.0

Author: wgibbs-rs

.github/workflows/blang.yml

@@ -11,9 +11,6 @@ jobs:
     - name: Install dependencies
       run: brew install flex bison llvm
 
-    - name: Test LLVM Version
-      run: brew list --versions llvm
-
     - name: Build
       run: cmake . && make
 

src/binary.cpp

@@ -66,21 +66,26 @@ extern "C" void initialize_llvm() {
 }
 
 extern "C" void export_asm() {
-   std::basic_string<char> targetTriple = llvm::sys::getDefaultTargetTriple();
-   TheModule->setTargetTriple(targetTriple);
+   // Construct a Triple from the default target triple string
+   llvm::Triple triple(llvm::sys::getDefaultTargetTriple());
 
-   std::string error;
-   const llvm::Target* target = llvm::TargetRegistry::lookupTarget(targetTriple, error);
+   // Set the module's target triple (takes llvm::Triple now)
+   TheModule->setTargetTriple(triple);
 
+   // Look up the target with the Triple
+   std::string error;
+   auto target = llvm::TargetRegistry::lookupTarget(triple, error);
    if (!target) {
       llvm::errs() << "Failed to lookup target: " << error << "\n";
       return;
    }
 
+   // Create the TargetMachine using the Triple (string overload is deprecated)
    llvm::TargetOptions opt;
    auto RM = std::optional<llvm::Reloc::Model>();
-   llvm::TargetMachine* targetMachine = target->createTargetMachine(targetTriple, "generic", "", opt, RM);
+   auto targetMachine = target->createTargetMachine(triple, "generic", "", opt, RM);
 
+   // Update the module data layout
    TheModule->setDataLayout(targetMachine->createDataLayout());
 
    // Prepare output file
@@ -122,21 +127,26 @@ extern "C" void export_ir() {
 }
 
 extern "C" void generate_binary() {
-   std::basic_string<char> targetTriple = llvm::sys::getDefaultTargetTriple();
-   TheModule->setTargetTriple(targetTriple);
+   // Construct a Triple from the default target triple string
+   llvm::Triple triple(llvm::sys::getDefaultTargetTriple());
 
-   std::string error;
-   const llvm::Target* target = llvm::TargetRegistry::lookupTarget(targetTriple, error);
+   // Set the module's target triple (takes llvm::Triple now)
+   TheModule->setTargetTriple(triple);
 
+   // Look up the target with the Triple
+   std::string error;
+   auto target = llvm::TargetRegistry::lookupTarget(triple, error);
    if (!target) {
       llvm::errs() << "Failed to lookup target: " << error << "\n";
       return;
    }
 
+   // Create the TargetMachine using the Triple (string overload is deprecated)
    llvm::TargetOptions opt;
    auto RM = std::optional<llvm::Reloc::Model>();
-   llvm::TargetMachine* targetMachine = target->createTargetMachine(targetTriple, "generic", "", opt, RM);
+   auto targetMachine = target->createTargetMachine(triple, "generic", "", opt, RM);
 
+   // Update the module data layout
    TheModule->setDataLayout(targetMachine->createDataLayout());
 
    // Prepare output file

src/llvm_ir.cpp

@@ -326,10 +326,8 @@ static void add_function(ASTNode* node) {
    add_statement(node->function.statements); // Begin adding statements to module.
 
    // If no return statement is made, then return undefined information.
-   if (!functionDoesReturn) {
-      llvm::Value* undefined_value = llvm::UndefValue::get(Builder->getInt64Ty());
-      Builder->CreateRet(undefined_value);
-   }
+   if (!functionDoesReturn)
+      Builder->CreateRet(llvm::UndefValue::get(Builder->getInt64Ty()));
 }
 
 static void add_global_variable(ASTNode* node) {