LLVMBuildUtils: Move register type loading to a separate method

Author: adazem009

src/engine/internal/llvm/llvmbuildutils.cpp

@@ -732,21 +732,8 @@ void LLVMBuildUtils::createValueStore(
     assert(destIsIntVar->getType()->isPointerTy());
     assert(destIntVar->getType()->isPointerTy());
 
-    auto it = std::find_if(TYPE_MAP.begin(), TYPE_MAP.end(), [targetType](const std::pair<ValueType, Compiler::StaticType> &pair) { return pair.second == targetType; });
-    const ValueType mappedType = it == TYPE_MAP.cend() ? ValueType::Number : it->first; // unknown type can be ignored
-    assert(!(reg->isRawValue && it == TYPE_MAP.cend()));
-
     // Handle multiple type cases with runtime switch
-    llvm::Value *loadedTargetType = nullptr;
-
-    if (reg->isRawValue)
-        loadedTargetType = m_builder.getInt32(static_cast<uint32_t>(mappedType));
-    else {
-        assert(!reg->isConst());
-        llvm::Value *targetTypePtr = getValueTypePtr(reg);
-        loadedTargetType = m_builder.CreateLoad(m_builder.getInt32Ty(), targetTypePtr);
-    }
-
+    llvm::Value *loadedTargetType = loadRegisterType(reg, targetType);
     llvm::Value *loadedDestType = m_builder.CreateLoad(m_builder.getInt32Ty(), destTypePtr);
 
     llvm::BasicBlock *mergeBlock = llvm::BasicBlock::Create(m_llvmCtx, "merge", m_function);
@@ -1414,6 +1401,17 @@ void LLVMBuildUtils::createListMap()
     }
 }
 
+llvm::Value *LLVMBuildUtils::loadRegisterType(LLVMRegister *reg, Compiler::StaticType type)
+{
+    if (reg->isRawValue)
+        return m_builder.getInt32(static_cast<uint32_t>(mapType(type)));
+    else {
+        assert(!reg->isConst());
+        llvm::Value *typePtr = getValueTypePtr(reg);
+        return m_builder.CreateLoad(m_builder.getInt32Ty(), typePtr);
+    }
+}
+
 llvm::Value *LLVMBuildUtils::castRawValue(LLVMRegister *reg, Compiler::StaticType targetType, NumberType targetNumType)
 {
     if (reg->type() == targetType) {

src/engine/internal/llvm/llvmbuildutils.h

@@ -123,6 +123,8 @@ class LLVMBuildUtils
         void createVariableMap();
         void createListMap();
 
+        llvm::Value *loadRegisterType(LLVMRegister *reg, Compiler::StaticType type);
+
         llvm::Value *castRawValue(LLVMRegister *reg, Compiler::StaticType targetType, NumberType targetNumType);
         llvm::Constant *castConstValue(const Value &value, Compiler::StaticType targetType, NumberType targetNumType);