LLVMTypeAnalyzer: Ignore query points that write to the variable

Author: adazem009

src/engine/internal/llvm/llvmtypeanalyzer.cpp

@@ -66,7 +66,7 @@ Compiler::StaticType LLVMTypeAnalyzer::variableType(
     visitedInstructions.insert(pos);
 
     // Check the last write operation before the instruction
-    const LLVMInstruction *ins = pos;
+    const LLVMInstruction *ins = pos->previous;
     const LLVMInstruction *write = nullptr;
     std::pair<const LLVMInstruction *, int> firstBranch = { nullptr, 0 };
     std::pair<const LLVMInstruction *, int> firstElseBranch = { nullptr, 0 };

test/llvm/type_analyzer/listtype_test.cpp

@@ -79,6 +79,21 @@ TEST(LLVMTypeAnalyzer_ListType, NoWriteOperationsUnknownType_Empty)
     ASSERT_EQ(analyzer.listType(&list, funcCall.get(), Compiler::StaticType::Unknown, true), Compiler::StaticType::Unknown);
 }
 
+TEST(LLVMTypeAnalyzer_ListType, QueryPointIsWrite)
+{
+    LLVMTypeAnalyzer analyzer;
+    LLVMInstructionList instructionList;
+    List list("", "");
+
+    auto appendList = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::AppendToList, nullptr, false);
+    LLVMConstantRegister value(Compiler::StaticType::Number, 1.25);
+    appendList->workList = &list;
+    appendList->args.push_back({ Compiler::StaticType::Unknown, &value });
+    instructionList.addInstruction(appendList);
+
+    ASSERT_EQ(analyzer.listType(&list, appendList.get(), Compiler::StaticType::String, false), Compiler::StaticType::String);
+}
+
 TEST(LLVMTypeAnalyzer_ListType, Loop_SingleWriteSameTypeNumber_Before_NonEmpty)
 {
     LLVMTypeAnalyzer analyzer;

test/llvm/type_analyzer/variabletype_test.cpp

@@ -55,6 +55,21 @@ TEST(LLVMTypeAnalyzer_VariableType, NoWriteOperationsUnknownType)
     ASSERT_EQ(analyzer.variableType(&var, funcCall.get(), Compiler::StaticType::Unknown), Compiler::StaticType::Unknown);
 }
 
+TEST(LLVMTypeAnalyzer_VariableType, QueryPointIsWrite)
+{
+    LLVMTypeAnalyzer analyzer;
+    LLVMInstructionList list;
+    Variable var("", "");
+
+    auto setVar = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::WriteVariable, nullptr, false);
+    LLVMConstantRegister value(Compiler::StaticType::Number, 1.25);
+    setVar->workVariable = &var;
+    setVar->args.push_back({ Compiler::StaticType::Unknown, &value });
+    list.addInstruction(setVar);
+
+    ASSERT_EQ(analyzer.variableType(&var, setVar.get(), Compiler::StaticType::Unknown), Compiler::StaticType::Unknown);
+}
+
 TEST(LLVMTypeAnalyzer_VariableType, Loop_SingleWriteSameTypeNumber_Before)
 {
     LLVMTypeAnalyzer analyzer;