@@ -624,7 +624,7 @@ llvm::Value *LLVMBuildUtils::removeNaN(llvm::Value *num)
624624 return m_builder.CreateSelect (isNaN (num), llvm::ConstantFP::get (m_llvmCtx, llvm::APFloat (0.0 )), num);
625625}
626626
627- void LLVMBuildUtils::createValueStore (LLVMRegister *reg, llvm::Value *targetPtr , Compiler::StaticType sourceType , Compiler::StaticType targetType)
627+ void LLVMBuildUtils::createValueStore (LLVMRegister *reg, llvm::Value *destPtr , Compiler::StaticType destType , Compiler::StaticType targetType)
628628{
629629 llvm::Value *converted = nullptr ;
630630
@@ -636,62 +636,62 @@ void LLVMBuildUtils::createValueStore(LLVMRegister *reg, llvm::Value *targetPtr,
636636
637637 switch (targetType) {
638638 case Compiler::StaticType::Number:
639- switch (sourceType ) {
639+ switch (destType ) {
640640 case Compiler::StaticType::Number: {
641641 // Write number to number directly
642- llvm::Value *ptr = m_builder.CreateStructGEP (m_valueDataType, targetPtr , 0 );
642+ llvm::Value *ptr = m_builder.CreateStructGEP (m_valueDataType, destPtr , 0 );
643643 m_builder.CreateStore (converted, ptr);
644644 break ;
645645 }
646646
647647 case Compiler::StaticType::Bool: {
648648 // Write number to bool value directly and change type
649- llvm::Value *ptr = m_builder.CreateStructGEP (m_valueDataType, targetPtr , 0 );
650- llvm::Value *typePtr = m_builder.CreateStructGEP (m_valueDataType, targetPtr , 1 );
649+ llvm::Value *ptr = m_builder.CreateStructGEP (m_valueDataType, destPtr , 0 );
650+ llvm::Value *typePtr = m_builder.CreateStructGEP (m_valueDataType, destPtr , 1 );
651651 m_builder.CreateStore (converted, ptr);
652652 m_builder.CreateStore (m_builder.getInt32 (static_cast <uint32_t >(mappedType)), typePtr);
653653 break ;
654654 }
655655
656656 default :
657- m_builder.CreateCall (m_functions.resolve_value_assign_double (), { targetPtr , converted });
657+ m_builder.CreateCall (m_functions.resolve_value_assign_double (), { destPtr , converted });
658658 break ;
659659 }
660660
661661 break ;
662662
663663 case Compiler::StaticType::Bool:
664- switch (sourceType ) {
664+ switch (destType ) {
665665 case Compiler::StaticType::Number: {
666666 // Write bool to number value directly and change type
667- llvm::Value *ptr = m_builder.CreateStructGEP (m_valueDataType, targetPtr , 0 );
667+ llvm::Value *ptr = m_builder.CreateStructGEP (m_valueDataType, destPtr , 0 );
668668 m_builder.CreateStore (converted, ptr);
669- llvm::Value *typePtr = m_builder.CreateStructGEP (m_valueDataType, targetPtr , 1 );
669+ llvm::Value *typePtr = m_builder.CreateStructGEP (m_valueDataType, destPtr , 1 );
670670 m_builder.CreateStore (converted, ptr);
671671 m_builder.CreateStore (m_builder.getInt32 (static_cast <uint32_t >(mappedType)), typePtr);
672672 break ;
673673 }
674674
675675 case Compiler::StaticType::Bool: {
676676 // Write bool to bool directly
677- llvm::Value *ptr = m_builder.CreateStructGEP (m_valueDataType, targetPtr , 0 );
677+ llvm::Value *ptr = m_builder.CreateStructGEP (m_valueDataType, destPtr , 0 );
678678 m_builder.CreateStore (converted, ptr);
679679 break ;
680680 }
681681
682682 default :
683- m_builder.CreateCall (m_functions.resolve_value_assign_bool (), { targetPtr , converted });
683+ m_builder.CreateCall (m_functions.resolve_value_assign_bool (), { destPtr , converted });
684684 break ;
685685 }
686686
687687 break ;
688688
689689 case Compiler::StaticType::String:
690- m_builder.CreateCall (m_functions.resolve_value_assign_stringPtr (), { targetPtr , converted });
690+ m_builder.CreateCall (m_functions.resolve_value_assign_stringPtr (), { destPtr , converted });
691691 break ;
692692
693693 case Compiler::StaticType::Unknown:
694- m_builder.CreateCall (m_functions.resolve_value_assign_copy (), { targetPtr , reg->value });
694+ m_builder.CreateCall (m_functions.resolve_value_assign_copy (), { destPtr , reg->value });
695695 break ;
696696
697697 default :
@@ -700,17 +700,17 @@ void LLVMBuildUtils::createValueStore(LLVMRegister *reg, llvm::Value *targetPtr,
700700 }
701701}
702702
703- void LLVMBuildUtils::createReusedValueStore (LLVMRegister *reg, llvm::Value *targetPtr , Compiler::StaticType sourceType , Compiler::StaticType targetType)
703+ void LLVMBuildUtils::createReusedValueStore (LLVMRegister *reg, llvm::Value *destPtr , Compiler::StaticType destType , Compiler::StaticType targetType)
704704{
705705 // Same as createValueStore(), but ensures that type is updated
706- createValueStore (reg, targetPtr, sourceType , targetType);
706+ createValueStore (reg, destPtr, destType , targetType);
707707
708708 auto it = std::find_if (TYPE_MAP.begin (), TYPE_MAP.end (), [targetType](const std::pair<ValueType, Compiler::StaticType> &pair) { return pair.second == targetType; });
709709 const ValueType mappedType = it == TYPE_MAP.cend () ? ValueType::Number : it->first ; // unknown type can be ignored
710710
711- if ((targetType == Compiler::StaticType::Number || targetType == Compiler::StaticType::Bool) && targetType == sourceType ) {
711+ if ((targetType == Compiler::StaticType::Number || targetType == Compiler::StaticType::Bool) && targetType == destType ) {
712712 // Update type when writing number to number and bool to bool
713- llvm::Value *typePtr = m_builder.CreateStructGEP (m_valueDataType, targetPtr , 1 );
713+ llvm::Value *typePtr = m_builder.CreateStructGEP (m_valueDataType, destPtr , 1 );
714714 m_builder.CreateStore (m_builder.getInt32 (static_cast <uint32_t >(mappedType)), typePtr);
715715 }
716716}
0 commit comments