Store custom LLVM types in LLVMCompilerContext

Author: adazem009

src/engine/internal/llvm/llvmcodebuilder.cpp

@@ -15,7 +15,6 @@
 #include "llvmconstantregister.h"
 #include "llvmifstatement.h"
 #include "llvmloop.h"
-#include "llvmtypes.h"
 #include "llvmloopscope.h"
 
 using namespace libscratchcpp;
@@ -1851,8 +1850,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_llvmCtx);
-    m_stringPtrType = LLVMTypes::createStringPtrType(m_llvmCtx);
+    m_valueDataType = m_ctx->valueDataType();
+    m_stringPtrType = m_ctx->stringPtrType();
 }
 
 void LLVMCodeBuilder::createVariableMap()

src/engine/internal/llvm/llvmcompilercontext.cpp

@@ -9,6 +9,7 @@
 
 #include "llvmcompilercontext.h"
 #include "llvmcoroutine.h"
+#include "llvmtypes.h"
 
 using namespace libscratchcpp;
 
@@ -18,10 +19,16 @@ LLVMCompilerContext::LLVMCompilerContext(IEngine *engine, Target *target) :
     m_module(std::make_unique<llvm::Module>(target ? target->name() : "", *m_llvmCtx)),
     m_llvmCtxPtr(m_llvmCtx.get()),
     m_modulePtr(m_module.get()),
-    m_jit((initTarget(), llvm::orc::LLJITBuilder().create())),
-    m_llvmCoroResumeFunction(createCoroResumeFunction()),
-    m_llvmCoroDestroyFunction(createCoroDestroyFunction())
+    m_jit((initTarget(), llvm::orc::LLJITBuilder().create()))
 {
+    // Create functions
+    m_llvmCoroResumeFunction = createCoroResumeFunction();
+    m_llvmCoroDestroyFunction = createCoroDestroyFunction();
+
+    // Create types
+    m_valueDataType = LLVMTypes::createValueDataType(*m_llvmCtx);
+    m_stringPtrType = LLVMTypes::createStringPtrType(*m_llvmCtx);
+
     if (!m_jit) {
         llvm::errs() << "error: failed to create JIT: " << toString(m_jit.takeError()) << "\n";
         return;
@@ -129,6 +136,16 @@ void LLVMCompilerContext::destroyCoroutine(void *handle)
     m_coroDestroyFunction(handle);
 }
 
+llvm::StructType *LLVMCompilerContext::valueDataType() const
+{
+    return m_valueDataType;
+}
+
+llvm::StructType *LLVMCompilerContext::stringPtrType() const
+{
+    return m_stringPtrType;
+}
+
 void LLVMCompilerContext::initTarget()
 {
     llvm::InitializeNativeTarget();

src/engine/internal/llvm/llvmcompilercontext.h

@@ -31,6 +31,9 @@ class LLVMCompilerContext : public CompilerContext
         llvm::Function *coroutineResumeFunction() const;
         void destroyCoroutine(void *handle);
 
+        llvm::StructType *valueDataType() const;
+        llvm::StructType *stringPtrType() const;
+
         template<typename T>
         T lookupFunction(const std::string &name)
         {
@@ -49,6 +52,7 @@ class LLVMCompilerContext : public CompilerContext
         using DestroyCoroFuncType = void (*)(void *);
 
         void initTarget();
+
         llvm::Function *createCoroResumeFunction();
         llvm::Function *createCoroDestroyFunction();
 
@@ -65,6 +69,9 @@ class LLVMCompilerContext : public CompilerContext
 
         llvm::Function *m_llvmCoroDestroyFunction = nullptr;
         DestroyCoroFuncType m_coroDestroyFunction = nullptr;
+
+        llvm::StructType *m_valueDataType = nullptr;
+        llvm::StructType *m_stringPtrType = nullptr;
 };
 
 } // 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_llvmCtx);
+            m_valueDataType = m_ctx->valueDataType();
             test_function(nullptr, nullptr, nullptr, nullptr, nullptr); // force dependency
 
             m_script = std::make_unique<Script>(&m_target, nullptr, &m_engine);