Support mixed types in select instruction

Author: adazem009

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

@@ -79,12 +79,12 @@ LLVMInstruction *Control::buildSelect(LLVMInstruction *ins)
     llvm::Value *trueValue;
     llvm::Value *falseValue;
 
-    if (type == Compiler::StaticType::Unknown) {
-        trueValue = m_utils.createValue(arg2.second);
-        falseValue = m_utils.createValue(arg3.second);
-    } else {
+    if (m_utils.isSingleType(type)) {
         trueValue = m_utils.castValue(arg2.second, type);
         falseValue = m_utils.castValue(arg3.second, type);
+    } else {
+        trueValue = m_utils.createValue(arg2.second);
+        falseValue = m_utils.createValue(arg3.second);
     }
 
     ins->functionReturnReg->value = m_builder.CreateSelect(cond, trueValue, falseValue);

src/engine/internal/llvm/llvmcodebuilder.cpp

@@ -399,10 +399,7 @@ CompilerValue *LLVMCodeBuilder::createStringConcat(CompilerValue *string1, Compi
 CompilerValue *LLVMCodeBuilder::createSelect(CompilerValue *cond, CompilerValue *trueValue, CompilerValue *falseValue, Compiler::StaticType valueType)
 {
     LLVMRegister *ret = createOp(LLVMInstruction::Type::Select, valueType, { Compiler::StaticType::Bool, valueType, valueType }, { cond, trueValue, falseValue });
-
-    if (valueType == Compiler::StaticType::Unknown)
-        ret->isRawValue = false;
-
+    ret->isRawValue = m_utils.isSingleType(valueType);
     return ret;
 }
 

test/llvm/llvmcodebuilder_test.cpp

@@ -761,6 +761,10 @@ TEST_F(LLVMCodeBuilderTest, Select)
     v = builder->createSelect(v, builder->addConstValue("abc"), builder->addConstValue(true), Compiler::StaticType::Unknown);
     builder->addFunctionCall("test_print_string", Compiler::StaticType::Void, { Compiler::StaticType::String }, { v });
 
+    v = builder->addConstValue(true);
+    v = builder->createSelect(v, builder->addConstValue("abc"), builder->addConstValue(true), Compiler::StaticType::String | Compiler::StaticType::Bool);
+    builder->addFunctionCall("test_print_string", Compiler::StaticType::Void, { Compiler::StaticType::String }, { v });
+
     static const std::string expected =
         "5.8\n"
         "-17.42\n"
@@ -773,7 +777,8 @@ TEST_F(LLVMCodeBuilderTest, Select)
         "1\n"
         "0\n"
         "test\n"
-        "true\n";
+        "true\n"
+        "abc\n";
 
     auto code = builder->build();
     Script script(&sprite, nullptr, nullptr);