LLVMTypeAnalyzer: Make variableTypeAfterBranchFromEnd() generic

* for variables and lists

Author: adazem009

src/engine/internal/llvm/llvmtypeanalyzer.cpp

@@ -131,10 +131,11 @@ Compiler::StaticType LLVMTypeAnalyzer::variableTypeAfterBranch(Variable *var, LL
 
     // Process the branch from end
     bool write = false; // only used internally (the compiler doesn't need this)
-    return variableTypeAfterBranchFromEnd(var, ins, previousType, write, visitedInstructions);
+    return typeAfterBranchFromEnd(var, end, previousType, write, visitedInstructions);
 }
 
-Compiler::StaticType LLVMTypeAnalyzer::variableTypeAfterBranchFromEnd(Variable *var, LLVMInstruction *end, Compiler::StaticType previousType, bool &write, InstructionSet &visitedInstructions) const
+Compiler::StaticType
+LLVMTypeAnalyzer::typeAfterBranchFromEnd(std::variant<Variable *, List *> varOrList, LLVMInstruction *end, Compiler::StaticType previousType, bool &write, InstructionSet &visitedInstructions) const
 {
     // Find the last write instruction
     LLVMInstruction *ins = end->previous;
@@ -143,7 +144,7 @@ Compiler::StaticType LLVMTypeAnalyzer::variableTypeAfterBranchFromEnd(Variable *
     while (ins && !isLoopStart(ins) && !isIfStart(ins)) {
         if (isLoopEnd(ins) || isIfEnd(ins) || isElse(ins)) {
             // Process the nested loop or if statement
-            Compiler::StaticType ret = variableTypeAfterBranchFromEnd(var, ins, previousType, write, visitedInstructions);
+            Compiler::StaticType ret = typeAfterBranchFromEnd(varOrList, ins, previousType, write, visitedInstructions);
 
             if (typesMatch(ret, previousType)) {
                 if (write)
@@ -155,7 +156,7 @@ Compiler::StaticType LLVMTypeAnalyzer::variableTypeAfterBranchFromEnd(Variable *
 
             if (isElse(ins)) {
                 // Process if branch (the else branch is already processed)
-                ret = variableTypeAfterBranchFromEnd(var, ins, previousType, write, visitedInstructions);
+                ret = typeAfterBranchFromEnd(varOrList, ins, previousType, write, visitedInstructions);
 
                 if (typesMatch(ret, previousType)) {
                     if (write) {
@@ -169,7 +170,7 @@ Compiler::StaticType LLVMTypeAnalyzer::variableTypeAfterBranchFromEnd(Variable *
 
                 ins = skipBranch(ins);
             }
-        } else if (isVariableWrite(ins, var) && !isWriteNoOp(ins)) {
+        } else if (std::holds_alternative<Variable *>(varOrList), isVariableWrite(ins, std::get<Variable *>(varOrList)) && !isWriteNoOp(ins)) {
             // Variable write instruction
             Compiler::StaticType writeType = writeValueType(ins, visitedInstructions);
             write = true;

src/engine/internal/llvm/llvmtypeanalyzer.h

@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 
 #include <scratchcpp/compiler.h>
+#include <variant>
 
 namespace libscratchcpp
 {
@@ -19,8 +20,11 @@ class LLVMTypeAnalyzer
 
         Compiler::StaticType variableType(Variable *var, LLVMInstruction *pos, Compiler::StaticType previousType, InstructionSet &visitedInstructions) const;
         Compiler::StaticType variableTypeAfterBranch(Variable *var, LLVMInstruction *start, Compiler::StaticType previousType, InstructionSet &visitedInstructions) const;
-        Compiler::StaticType variableTypeAfterBranchFromEnd(Variable *var, LLVMInstruction *end, Compiler::StaticType previousType, bool &write, InstructionSet &visitedInstructions) const;
 
+        Compiler::StaticType
+        typeAfterBranchFromEnd(std::variant<Variable *, List *> varOrList, LLVMInstruction *end, Compiler::StaticType previousType, bool &write, InstructionSet &visitedInstructions) const;
+
+        LLVMInstruction *branchEnd(LLVMInstruction *start) const;
         LLVMInstruction *skipBranch(LLVMInstruction *pos) const;
 
         bool isLoopStart(LLVMInstruction *ins) const;