Swap source and target type parameters in create store methods

Author: adazem009

src/engine/internal/llvm/instructions/lists.cpp

@@ -123,14 +123,14 @@ LLVMInstruction *Lists::buildAppendToList(LLVMInstruction *ins)
     // If there's enough space, use the allocated memory
     m_builder.SetInsertPoint(ifBlock);
     llvm::Value *itemPtr = m_utils.getListItem(listPtr, size);
-    m_utils.createReusedValueStore(arg.second, itemPtr, type, listType);
+    m_utils.createReusedValueStore(arg.second, itemPtr, listType, type);
     m_builder.CreateStore(m_builder.CreateAdd(size, m_builder.getInt64(1)), listPtr.sizePtr);
     m_builder.CreateBr(nextBlock);
 
     // Otherwise call appendEmpty()
     m_builder.SetInsertPoint(elseBlock);
     itemPtr = m_builder.CreateCall(m_utils.functions().resolve_list_append_empty(), listPtr.ptr);
-    m_utils.createReusedValueStore(arg.second, itemPtr, type, listType);
+    m_utils.createReusedValueStore(arg.second, itemPtr, listType, type);
     m_builder.CreateBr(nextBlock);
 
     m_builder.SetInsertPoint(nextBlock);
@@ -164,7 +164,7 @@ LLVMInstruction *Lists::buildInsertToList(LLVMInstruction *ins)
     m_builder.SetInsertPoint(insertBlock);
     index = m_builder.CreateFPToUI(index, m_builder.getInt64Ty());
     llvm::Value *itemPtr = m_builder.CreateCall(m_utils.functions().resolve_list_insert_empty(), { listPtr.ptr, index });
-    m_utils.createReusedValueStore(valueArg.second, itemPtr, type, listType);
+    m_utils.createReusedValueStore(valueArg.second, itemPtr, listType, type);
 
     m_builder.CreateBr(nextBlock);
 
@@ -199,7 +199,7 @@ LLVMInstruction *Lists::buildListReplace(LLVMInstruction *ins)
     m_builder.SetInsertPoint(replaceBlock);
     index = m_builder.CreateFPToUI(index, m_builder.getInt64Ty());
     llvm::Value *itemPtr = m_utils.getListItem(listPtr, index);
-    m_utils.createValueStore(valueArg.second, itemPtr, type, listType);
+    m_utils.createValueStore(valueArg.second, itemPtr, listType, type);
     m_builder.CreateBr(nextBlock);
 
     m_builder.SetInsertPoint(nextBlock);

src/engine/internal/llvm/instructions/variables.cpp

@@ -134,7 +134,7 @@ LLVMInstruction *Variables::buildWriteVariable(LLVMInstruction *ins)
                         m_builder.CreateStore(m_builder.getInt32(static_cast<uint32_t>(mappedType)), typeField);
                     }*/
 
-    m_utils.createValueStore(arg.second, varPtr.stackPtr, argType, ins->targetType);
+    m_utils.createValueStore(arg.second, varPtr.stackPtr, ins->targetType, argType);
     return ins->next;
 }
 

src/engine/internal/llvm/llvmbuildutils.cpp

@@ -628,15 +628,15 @@ void LLVMBuildUtils::createValueStore(LLVMRegister *reg, llvm::Value *targetPtr,
 {
     llvm::Value *converted = nullptr;
 
-    if (sourceType != Compiler::StaticType::Unknown)
-        converted = castValue(reg, sourceType);
+    if (targetType != Compiler::StaticType::Unknown)
+        converted = castValue(reg, targetType);
 
-    auto it = std::find_if(TYPE_MAP.begin(), TYPE_MAP.end(), [sourceType](const std::pair<ValueType, Compiler::StaticType> &pair) { return pair.second == sourceType; });
+    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
 
-    switch (sourceType) {
+    switch (targetType) {
         case Compiler::StaticType::Number:
-            switch (targetType) {
+            switch (sourceType) {
                 case Compiler::StaticType::Number: {
                     // Write number to number directly
                     llvm::Value *ptr = m_builder.CreateStructGEP(m_valueDataType, targetPtr, 0);
@@ -661,7 +661,7 @@ void LLVMBuildUtils::createValueStore(LLVMRegister *reg, llvm::Value *targetPtr,
             break;
 
         case Compiler::StaticType::Bool:
-            switch (targetType) {
+            switch (sourceType) {
                 case Compiler::StaticType::Number: {
                     // Write bool to number value directly and change type
                     llvm::Value *ptr = m_builder.CreateStructGEP(m_valueDataType, targetPtr, 0);
@@ -705,10 +705,10 @@ void LLVMBuildUtils::createReusedValueStore(LLVMRegister *reg, llvm::Value *targ
     // Same as createValueStore(), but ensures that type is updated
     createValueStore(reg, targetPtr, sourceType, targetType);
 
-    auto it = std::find_if(TYPE_MAP.begin(), TYPE_MAP.end(), [sourceType](const std::pair<ValueType, Compiler::StaticType> &pair) { return pair.second == sourceType; });
+    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
 
-    if ((sourceType == Compiler::StaticType::Number || sourceType == Compiler::StaticType::Bool) && sourceType == targetType) {
+    if ((targetType == Compiler::StaticType::Number || targetType == Compiler::StaticType::Bool) && targetType == sourceType) {
         // Update type when writing number to number and bool to bool
         llvm::Value *typePtr = m_builder.CreateStructGEP(m_valueDataType, targetPtr, 1);
         m_builder.CreateStore(m_builder.getInt32(static_cast<uint32_t>(mappedType)), typePtr);