LLVMCodeBuilder: Fix constants in reporter blocks/hat predicates

Author: adazem009

src/engine/internal/llvm/llvmcodebuilder.cpp

@@ -1328,16 +1328,22 @@ std::shared_ptr<ExecutableCode> LLVMCodeBuilder::finalize()
             break;
 
         case Compiler::CodeType::Reporter: {
-            // Use last instruction return value and create a ValueData instance
-            assert(!m_instructions.empty());
-            LLVMRegister *ret = m_instructions.back()->functionReturnReg;
-            m_builder.CreateRet(m_builder.CreateLoad(m_valueDataType, createNewValue(ret))); // return copy
+            // Use last instruction return value (or last constant) and create a ValueData instance
+            assert(!m_instructions.empty() || m_lastConstValue);
+            LLVMRegister *ret = m_instructions.empty() ? m_lastConstValue : m_instructions.back()->functionReturnReg;
+            llvm::Value *copy = createNewValue(ret);
+            m_builder.CreateRet(m_builder.CreateLoad(m_valueDataType, copy));
             break;
         }
+
         case Compiler::CodeType::HatPredicate:
-            // Use last instruction return value
-            assert(!m_instructions.empty());
-            m_builder.CreateRet(m_instructions.back()->functionReturnReg->value);
+            // Use last instruction return value (or last constant)
+            assert(!m_instructions.empty() || m_lastConstValue);
+
+            if (m_instructions.empty())
+                m_builder.CreateRet(castValue(m_lastConstValue, Compiler::StaticType::Bool));
+            else
+                m_builder.CreateRet(castValue(m_instructions.back()->functionReturnReg, Compiler::StaticType::Bool));
             break;
     }
 
@@ -1403,6 +1409,7 @@ CompilerConstant *LLVMCodeBuilder::addConstValue(const Value &value)
 {
     auto constReg = std::make_shared<LLVMConstantRegister>(TYPE_MAP[value.type()], value);
     auto reg = std::reinterpret_pointer_cast<LLVMRegister>(constReg);
+    m_lastConstValue = reg.get();
     return static_cast<CompilerConstant *>(static_cast<CompilerValue *>(addReg(reg, nullptr)));
 }
 

src/engine/internal/llvm/llvmcodebuilder.h

@@ -237,6 +237,7 @@ class LLVMCodeBuilder : public ICodeBuilder
         std::vector<std::shared_ptr<LLVMInstruction>> m_instructions;
         std::vector<std::shared_ptr<LLVMRegister>> m_regs;
         std::vector<std::shared_ptr<CompilerLocalVariable>> m_localVars;
+        LLVMRegister *m_lastConstValue = nullptr; // for reporters and hat predicates
         BlockPrototype *m_procedurePrototype = nullptr;
         bool m_defaultWarp = false;
         bool m_warp = false;

test/llvm/llvmcodebuilder_test.cpp

@@ -6007,15 +6007,14 @@ TEST_F(LLVMCodeBuilderTest, HatPredicates)
     // Predicate 1
     createPredicateBuilder(&sprite);
 
-    CompilerValue *v = m_builder->addConstValue(true);
-    m_builder->addFunctionCall("test_const_bool", Compiler::StaticType::Bool, { Compiler::StaticType::Bool }, { v });
+    m_builder->addConstValue(true);
 
     auto code1 = m_builder->finalize();
 
     // Predicate 2
     createPredicateBuilder(&sprite);
 
-    v = m_builder->addConstValue(false);
+    CompilerValue *v = m_builder->addConstValue(false);
     m_builder->addFunctionCall("test_const_bool", Compiler::StaticType::Bool, { Compiler::StaticType::Bool }, { v });
 
     auto code2 = m_builder->finalize();
@@ -6045,15 +6044,14 @@ TEST_F(LLVMCodeBuilderTest, Reporters)
     // Reporter 1
     createReporterBuilder(&sprite);
 
-    CompilerValue *v = m_builder->addConstValue(-45.23);
-    m_builder->addFunctionCall("test_const_number", Compiler::StaticType::Number, { Compiler::StaticType::Number }, { v });
+    m_builder->addConstValue(-45.23);
 
     auto code1 = m_builder->finalize();
 
     // Reporter 2
     createReporterBuilder(&sprite);
 
-    v = m_builder->addConstValue("test");
+    CompilerValue *v = m_builder->addConstValue("test");
     m_builder->addFunctionCall("test_const_string", Compiler::StaticType::String, { Compiler::StaticType::String }, { v });
 
     auto code2 = m_builder->finalize();