Do not pass IRBuilder to LLVMTypes

Author: adazem009

src/engine/internal/llvm/llvmcodebuilder.cpp

@@ -1851,8 +1851,8 @@ void LLVMCodeBuilder::createProcedureCall(BlockPrototype *prototype, const Compi
 void LLVMCodeBuilder::initTypes()
 {
     llvm::PointerType *pointerType = llvm::PointerType::get(llvm::Type::getInt8Ty(m_llvmCtx), 0);
-    m_valueDataType = LLVMTypes::createValueDataType(&m_builder);
-    m_stringPtrType = LLVMTypes::createStringPtrType(&m_builder);
+    m_valueDataType = LLVMTypes::createValueDataType(m_llvmCtx);
+    m_stringPtrType = LLVMTypes::createStringPtrType(m_llvmCtx);
 }
 
 void LLVMCodeBuilder::createVariableMap()

src/engine/internal/llvm/llvmtypes.cpp

@@ -6,12 +6,10 @@
 
 using namespace libscratchcpp;
 
-llvm::StructType *LLVMTypes::createValueDataType(llvm::IRBuilder<> *builder)
+llvm::StructType *LLVMTypes::createValueDataType(llvm::LLVMContext &ctx)
 {
-    llvm::LLVMContext &ctx = builder->getContext();
-
     // Create the ValueData struct
-    llvm::Type *unionType = builder->getInt64Ty(); // 64 bits is the largest size
+    llvm::Type *unionType = llvm::Type::getInt64Ty(ctx); // 64 bits is the largest size
 
     llvm::Type *valueType = llvm::Type::getInt32Ty(ctx); // Assuming ValueType is a 32-bit enum
     llvm::Type *padding = llvm::Type::getInt32Ty(ctx);   // Padding for alignment
@@ -22,10 +20,8 @@ llvm::StructType *LLVMTypes::createValueDataType(llvm::IRBuilder<> *builder)
     return ret;
 }
 
-llvm::StructType *LLVMTypes::createStringPtrType(llvm::IRBuilder<> *builder)
+llvm::StructType *LLVMTypes::createStringPtrType(llvm::LLVMContext &ctx)
 {
-    llvm::LLVMContext &ctx = builder->getContext();
-
     // Create the StringPtr struct
     llvm::PointerType *pointerType = llvm::PointerType::get(llvm::Type::getInt8Ty(ctx), 0);
     llvm::Type *sizeType = llvm::Type::getInt64Ty(ctx);

src/engine/internal/llvm/llvmtypes.h

@@ -17,8 +17,8 @@ namespace libscratchcpp
 class LLVMTypes
 {
     public:
-        static llvm::StructType *createValueDataType(llvm::IRBuilder<> *builder);
-        static llvm::StructType *createStringPtrType(llvm::IRBuilder<> *builder);
+        static llvm::StructType *createValueDataType(llvm::LLVMContext &ctx);
+        static llvm::StructType *createStringPtrType(llvm::LLVMContext &ctx);
 };
 
 } // namespace libscratchcpp

test/llvm/llvmexecutablecode_test.cpp

@@ -30,7 +30,7 @@ class LLVMExecutableCodeTest : public testing::Test
             m_module = m_ctx->module();
             m_llvmCtx = m_ctx->llvmCtx();
             m_builder = std::make_unique<llvm::IRBuilder<>>(*m_llvmCtx);
-            m_valueDataType = LLVMTypes::createValueDataType(m_builder.get());
+            m_valueDataType = LLVMTypes::createValueDataType(*m_llvmCtx);
             test_function(nullptr, nullptr, nullptr, nullptr, nullptr); // force dependency
 
             m_script = std::make_unique<Script>(&m_target, nullptr, &m_engine);