LLVMInstruction: Rename workVariable/workList fields

adazem009 · adazem009 · commit f0470f85ab50 · 2025-08-13T16:36:58.000+02:00
diff --git a/src/engine/internal/llvm/instructions/lists.cpp b/src/engine/internal/llvm/instructions/lists.cpp
@@ -64,7 +64,7 @@ ProcessResult Lists::process(LLVMInstruction *ins)
 LLVMInstruction *Lists::buildClearList(LLVMInstruction *ins)
 {
     assert(ins->args.size() == 0);
-    LLVMListPtr &listPtr = m_utils.listPtr(ins->workList);
+    LLVMListPtr &listPtr = m_utils.listPtr(ins->targetList);
     m_builder.CreateCall(m_utils.functions().resolve_list_clear(), listPtr.ptr);
 
     return ins->next;
@@ -77,7 +77,7 @@ LLVMInstruction *Lists::buildRemoveListItem(LLVMInstruction *ins)
 
     assert(ins->args.size() == 1);
     const auto &arg = ins->args[0];
-    LLVMListPtr &listPtr = m_utils.listPtr(ins->workList);
+    LLVMListPtr &listPtr = m_utils.listPtr(ins->targetList);
 
     // Range check
     llvm::Value *min = llvm::ConstantFP::get(llvmCtx, llvm::APFloat(0.0));
@@ -107,7 +107,7 @@ LLVMInstruction *Lists::buildAppendToList(LLVMInstruction *ins)
     assert(ins->args.size() == 1);
     const auto &arg = ins->args[0];
     Compiler::StaticType type = m_utils.optimizeRegisterType(arg.second);
-    LLVMListPtr &listPtr = m_utils.listPtr(ins->workList);
+    LLVMListPtr &listPtr = m_utils.listPtr(ins->targetList);
 
     Compiler::StaticType listType = ins->targetType;
 
@@ -146,7 +146,7 @@ LLVMInstruction *Lists::buildInsertToList(LLVMInstruction *ins)
     const auto &indexArg = ins->args[0];
     const auto &valueArg = ins->args[1];
     Compiler::StaticType type = m_utils.optimizeRegisterType(valueArg.second);
-    LLVMListPtr &listPtr = m_utils.listPtr(ins->workList);
+    LLVMListPtr &listPtr = m_utils.listPtr(ins->targetList);
 
     Compiler::StaticType listType = ins->targetType;
 
@@ -181,7 +181,7 @@ LLVMInstruction *Lists::buildListReplace(LLVMInstruction *ins)
     const auto &indexArg = ins->args[0];
     const auto &valueArg = ins->args[1];
     Compiler::StaticType type = m_utils.optimizeRegisterType(valueArg.second);
-    LLVMListPtr &listPtr = m_utils.listPtr(ins->workList);
+    LLVMListPtr &listPtr = m_utils.listPtr(ins->targetList);
 
     Compiler::StaticType listType = ins->targetType;
 
@@ -209,7 +209,7 @@ LLVMInstruction *Lists::buildListReplace(LLVMInstruction *ins)
 LLVMInstruction *Lists::buildGetListContents(LLVMInstruction *ins)
 {
     assert(ins->args.size() == 0);
-    const LLVMListPtr &listPtr = m_utils.listPtr(ins->workList);
+    const LLVMListPtr &listPtr = m_utils.listPtr(ins->targetList);
     llvm::Value *ptr = m_builder.CreateCall(m_utils.functions().resolve_list_to_string(), listPtr.ptr);
     m_utils.freeStringLater(ptr);
     ins->functionReturnReg->value = ptr;
@@ -221,7 +221,7 @@ LLVMInstruction *Lists::buildGetListItem(LLVMInstruction *ins)
 {
     assert(ins->args.size() == 1);
     const auto &arg = ins->args[0];
-    LLVMListPtr &listPtr = m_utils.listPtr(ins->workList);
+    LLVMListPtr &listPtr = m_utils.listPtr(ins->targetList);
 
     Compiler::StaticType listType = ins->functionReturnReg->type();
 
@@ -243,7 +243,7 @@ LLVMInstruction *Lists::buildGetListItem(LLVMInstruction *ins)
 LLVMInstruction *Lists::buildGetListSize(LLVMInstruction *ins)
 {
     assert(ins->args.size() == 0);
-    const LLVMListPtr &listPtr = m_utils.listPtr(ins->workList);
+    const LLVMListPtr &listPtr = m_utils.listPtr(ins->targetList);
     llvm::Value *size = m_builder.CreateLoad(m_builder.getInt64Ty(), listPtr.sizePtr);
     ins->functionReturnReg->value = m_builder.CreateUIToFP(size, m_builder.getDoubleTy());
 
@@ -254,7 +254,7 @@ LLVMInstruction *Lists::buildGetListItemIndex(LLVMInstruction *ins)
 {
     assert(ins->args.size() == 1);
     const auto &arg = ins->args[0];
-    LLVMListPtr &listPtr = m_utils.listPtr(ins->workList);
+    LLVMListPtr &listPtr = m_utils.listPtr(ins->targetList);
 
     Compiler::StaticType listType = ins->targetType;
 
@@ -266,7 +266,7 @@ LLVMInstruction *Lists::buildListContainsItem(LLVMInstruction *ins)
 {
     assert(ins->args.size() == 1);
     const auto &arg = ins->args[0];
-    LLVMListPtr &listPtr = m_utils.listPtr(ins->workList);
+    LLVMListPtr &listPtr = m_utils.listPtr(ins->targetList);
 
     Compiler::StaticType listType = ins->targetType;
 
diff --git a/src/engine/internal/llvm/instructions/variables.cpp b/src/engine/internal/llvm/instructions/variables.cpp
@@ -110,7 +110,7 @@ LLVMInstruction *Variables::buildWriteVariable(LLVMInstruction *ins)
     assert(ins->args.size() == 1);
     const auto &arg = ins->args[0];
     Compiler::StaticType argType = m_utils.optimizeRegisterType(arg.second);
-    LLVMVariablePtr &varPtr = m_utils.variablePtr(ins->workVariable);
+    LLVMVariablePtr &varPtr = m_utils.variablePtr(ins->targetVariable);
     varPtr.changed = true; // TODO: Handle loops and if statements
 
     // Initialize stack variable on first assignment
@@ -141,7 +141,7 @@ LLVMInstruction *Variables::buildWriteVariable(LLVMInstruction *ins)
 LLVMInstruction *Variables::buildReadVariable(LLVMInstruction *ins)
 {
     assert(ins->args.size() == 0);
-    LLVMVariablePtr &varPtr = m_utils.variablePtr(ins->workVariable);
+    LLVMVariablePtr &varPtr = m_utils.variablePtr(ins->targetVariable);
 
     ins->functionReturnReg->value = varPtr.onStack && !(ins->loopCondition && !m_utils.warp()) ? varPtr.stackPtr : varPtr.heapPtr;
     return ins->next;
diff --git a/src/engine/internal/llvm/llvmbuildutils.cpp b/src/engine/internal/llvm/llvmbuildutils.cpp
@@ -74,7 +74,7 @@ void LLVMBuildUtils::init(llvm::Function *function, BlockPrototype *procedurePro
         /*Variable *variable = var;
         // TODO: Loop scope was used here, replace it with some "inside loop" flag if needed
         auto it = std::find_if(m_variableInstructions.begin(), m_variableInstructions.end(), [variable](const LLVMInstruction *ins) {
-            return ins->type == LLVMInstruction::Type::WriteVariable && ins->workVariable == variable && !ins->loopScope;
+            return ins->type == LLVMInstruction::Type::WriteVariable && ins->targetVariable == variable && !ins->loopScope;
         });
 
         if (it == m_variableInstructions.end()) {
diff --git a/src/engine/internal/llvm/llvmcodebuilder.cpp b/src/engine/internal/llvm/llvmcodebuilder.cpp
@@ -156,7 +156,7 @@ CompilerValue *LLVMCodeBuilder::addLocalVariableValue(CompilerLocalVariable *var
 CompilerValue *LLVMCodeBuilder::addVariableValue(Variable *variable)
 {
     auto ins = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::ReadVariable, m_loopCondition);
-    ins->workVariable = variable;
+    ins->targetVariable = variable;
     m_utils.createVariablePtr(variable);
 
     auto ret = std::make_shared<LLVMRegister>(Compiler::StaticType::Unknown);
@@ -170,7 +170,7 @@ CompilerValue *LLVMCodeBuilder::addVariableValue(Variable *variable)
 CompilerValue *LLVMCodeBuilder::addListContents(List *list)
 {
     LLVMInstruction ins(LLVMInstruction::Type::GetListContents, m_loopCondition);
-    ins.workList = list;
+    ins.targetList = list;
     m_utils.createListPtr(list);
 
     return createOp(ins, Compiler::StaticType::String);
@@ -179,7 +179,7 @@ CompilerValue *LLVMCodeBuilder::addListContents(List *list)
 CompilerValue *LLVMCodeBuilder::addListItem(List *list, CompilerValue *index)
 {
     auto ins = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::GetListItem, m_loopCondition);
-    ins->workList = list;
+    ins->targetList = list;
     m_utils.createListPtr(list);
 
     ins->args.push_back({ Compiler::StaticType::Number, dynamic_cast<LLVMRegister *>(index) });
@@ -195,7 +195,7 @@ CompilerValue *LLVMCodeBuilder::addListItem(List *list, CompilerValue *index)
 CompilerValue *LLVMCodeBuilder::addListItemIndex(List *list, CompilerValue *item)
 {
     LLVMInstruction ins(LLVMInstruction::Type::GetListItemIndex, m_loopCondition);
-    ins.workList = list;
+    ins.targetList = list;
     m_utils.createListPtr(list);
 
     auto ret = createOp(ins, Compiler::StaticType::Number, Compiler::StaticType::Unknown, { item });
@@ -205,7 +205,7 @@ CompilerValue *LLVMCodeBuilder::addListItemIndex(List *list, CompilerValue *item
 CompilerValue *LLVMCodeBuilder::addListContains(List *list, CompilerValue *item)
 {
     LLVMInstruction ins(LLVMInstruction::Type::ListContainsItem, m_loopCondition);
-    ins.workList = list;
+    ins.targetList = list;
     m_utils.createListPtr(list);
 
     auto ret = createOp(ins, Compiler::StaticType::Bool, Compiler::StaticType::Unknown, { item });
@@ -215,7 +215,7 @@ CompilerValue *LLVMCodeBuilder::addListContains(List *list, CompilerValue *item)
 CompilerValue *LLVMCodeBuilder::addListSize(List *list)
 {
     LLVMInstruction ins(LLVMInstruction::Type::GetListSize, m_loopCondition);
-    ins.workList = list;
+    ins.targetList = list;
     m_utils.createListPtr(list);
 
     return createOp(ins, Compiler::StaticType::Number);
@@ -422,47 +422,47 @@ void LLVMCodeBuilder::createLocalVariableWrite(CompilerLocalVariable *variable,
 void LLVMCodeBuilder::createVariableWrite(Variable *variable, CompilerValue *value)
 {
     LLVMInstruction ins(LLVMInstruction::Type::WriteVariable, m_loopCondition);
-    ins.workVariable = variable;
+    ins.targetVariable = variable;
     createOp(ins, Compiler::StaticType::Void, Compiler::StaticType::Unknown, { value });
     m_utils.createVariablePtr(variable);
 }
 
 void LLVMCodeBuilder::createListClear(List *list)
 {
     LLVMInstruction ins(LLVMInstruction::Type::ClearList, m_loopCondition);
-    ins.workList = list;
+    ins.targetList = list;
     createOp(ins, Compiler::StaticType::Void);
     m_utils.createListPtr(list);
 }
 
 void LLVMCodeBuilder::createListRemove(List *list, CompilerValue *index)
 {
     LLVMInstruction ins(LLVMInstruction::Type::RemoveListItem, m_loopCondition);
-    ins.workList = list;
+    ins.targetList = list;
     createOp(ins, Compiler::StaticType::Void, Compiler::StaticType::Number, { index });
     m_utils.createListPtr(list);
 }
 
 void LLVMCodeBuilder::createListAppend(List *list, CompilerValue *item)
 {
     LLVMInstruction ins(LLVMInstruction::Type::AppendToList, m_loopCondition);
-    ins.workList = list;
+    ins.targetList = list;
     createOp(ins, Compiler::StaticType::Void, Compiler::StaticType::Unknown, { item });
     m_utils.createListPtr(list);
 }
 
 void LLVMCodeBuilder::createListInsert(List *list, CompilerValue *index, CompilerValue *item)
 {
     LLVMInstruction ins(LLVMInstruction::Type::InsertToList, m_loopCondition);
-    ins.workList = list;
+    ins.targetList = list;
     createOp(ins, Compiler::StaticType::Void, { Compiler::StaticType::Number, Compiler::StaticType::Unknown }, { index, item });
     m_utils.createListPtr(list);
 }
 
 void LLVMCodeBuilder::createListReplace(List *list, CompilerValue *index, CompilerValue *item)
 {
     LLVMInstruction ins(LLVMInstruction::Type::ListReplace, m_loopCondition);
-    ins.workList = list;
+    ins.targetList = list;
     createOp(ins, Compiler::StaticType::Void, { Compiler::StaticType::Number, Compiler::StaticType::Unknown }, { index, item });
     m_utils.createListPtr(list);
 }
diff --git a/src/engine/internal/llvm/llvminstruction.h b/src/engine/internal/llvm/llvminstruction.h
@@ -92,8 +92,8 @@ struct LLVMInstruction
         LLVMRegister *functionReturnReg = nullptr;
         bool functionTargetArg = false;                                  // whether to add target ptr to function parameters
         bool functionCtxArg = false;                                     // whether to add execution context ptr to function parameters
-        Variable *workVariable = nullptr;                                // for variables
-        List *workList = nullptr;                                        // for lists
+        Variable *targetVariable = nullptr;                              // for variables
+        List *targetList = nullptr;                                      // for lists
         Compiler::StaticType targetType = Compiler::StaticType::Unknown; // variable or list type (before read/write operation)
         BlockPrototype *procedurePrototype = nullptr;
         size_t procedureArgIndex = 0;

Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ CompilerValue LLVMCodeBuilder::addLocalVariableValue(CompilerLocalVariable var`
`156`	`156`	`CompilerValue LLVMCodeBuilder::addVariableValue(Variable variable)`
`157`	`157`	`{`
`158`	`158`	`auto ins = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::ReadVariable, m_loopCondition);`
`159`		`- ins->workVariable = variable;`
	`159`	`+ ins->targetVariable = variable;`
`160`	`160`	`m_utils.createVariablePtr(variable);`
`161`	`161`
`162`	`162`	`auto ret = std::make_shared<LLVMRegister>(Compiler::StaticType::Unknown);`
`@@ -170,7 +170,7 @@ CompilerValue LLVMCodeBuilder::addVariableValue(Variable variable)`
`170`	`170`	`CompilerValue LLVMCodeBuilder::addListContents(List list)`
`171`	`171`	`{`
`172`	`172`	`LLVMInstruction ins(LLVMInstruction::Type::GetListContents, m_loopCondition);`
`173`		`- ins.workList = list;`
	`173`	`+ ins.targetList = list;`
`174`	`174`	`m_utils.createListPtr(list);`
`175`	`175`
`176`	`176`	`return createOp(ins, Compiler::StaticType::String);`
`@@ -179,7 +179,7 @@ CompilerValue LLVMCodeBuilder::addListContents(List list)`
`179`	`179`	`CompilerValue LLVMCodeBuilder::addListItem(List list, CompilerValue *index)`
`180`	`180`	`{`
`181`	`181`	`auto ins = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::GetListItem, m_loopCondition);`
`182`		`- ins->workList = list;`
	`182`	`+ ins->targetList = list;`
`183`	`183`	`m_utils.createListPtr(list);`
`184`	`184`
`185`	`185`	`ins->args.push_back({ Compiler::StaticType::Number, dynamic_cast<LLVMRegister *>(index) });`
`@@ -195,7 +195,7 @@ CompilerValue LLVMCodeBuilder::addListItem(List list, CompilerValue *index)`
`195`	`195`	`CompilerValue LLVMCodeBuilder::addListItemIndex(List list, CompilerValue *item)`
`196`	`196`	`{`
`197`	`197`	`LLVMInstruction ins(LLVMInstruction::Type::GetListItemIndex, m_loopCondition);`
`198`		`- ins.workList = list;`
	`198`	`+ ins.targetList = list;`
`199`	`199`	`m_utils.createListPtr(list);`
`200`	`200`
`201`	`201`	`auto ret = createOp(ins, Compiler::StaticType::Number, Compiler::StaticType::Unknown, { item });`
`@@ -205,7 +205,7 @@ CompilerValue LLVMCodeBuilder::addListItemIndex(List list, CompilerValue *item`
`205`	`205`	`CompilerValue LLVMCodeBuilder::addListContains(List list, CompilerValue *item)`
`206`	`206`	`{`
`207`	`207`	`LLVMInstruction ins(LLVMInstruction::Type::ListContainsItem, m_loopCondition);`
`208`		`- ins.workList = list;`
	`208`	`+ ins.targetList = list;`
`209`	`209`	`m_utils.createListPtr(list);`
`210`	`210`
`211`	`211`	`auto ret = createOp(ins, Compiler::StaticType::Bool, Compiler::StaticType::Unknown, { item });`
`@@ -215,7 +215,7 @@ CompilerValue LLVMCodeBuilder::addListContains(List list, CompilerValue *item)`
`215`	`215`	`CompilerValue LLVMCodeBuilder::addListSize(List list)`
`216`	`216`	`{`
`217`	`217`	`LLVMInstruction ins(LLVMInstruction::Type::GetListSize, m_loopCondition);`
`218`		`- ins.workList = list;`
	`218`	`+ ins.targetList = list;`
`219`	`219`	`m_utils.createListPtr(list);`
`220`	`220`
`221`	`221`	`return createOp(ins, Compiler::StaticType::Number);`
`@@ -422,47 +422,47 @@ void LLVMCodeBuilder::createLocalVariableWrite(CompilerLocalVariable *variable,`
`422`	`422`	`void LLVMCodeBuilder::createVariableWrite(Variable variable, CompilerValue value)`
`423`	`423`	`{`
`424`	`424`	`LLVMInstruction ins(LLVMInstruction::Type::WriteVariable, m_loopCondition);`
`425`		`- ins.workVariable = variable;`
	`425`	`+ ins.targetVariable = variable;`
`426`	`426`	`createOp(ins, Compiler::StaticType::Void, Compiler::StaticType::Unknown, { value });`
`427`	`427`	`m_utils.createVariablePtr(variable);`
`428`	`428`	`}`
`429`	`429`
`430`	`430`	`void LLVMCodeBuilder::createListClear(List *list)`
`431`	`431`	`{`
`432`	`432`	`LLVMInstruction ins(LLVMInstruction::Type::ClearList, m_loopCondition);`
`433`		`- ins.workList = list;`
	`433`	`+ ins.targetList = list;`
`434`	`434`	`createOp(ins, Compiler::StaticType::Void);`
`435`	`435`	`m_utils.createListPtr(list);`
`436`	`436`	`}`
`437`	`437`
`438`	`438`	`void LLVMCodeBuilder::createListRemove(List list, CompilerValue index)`
`439`	`439`	`{`
`440`	`440`	`LLVMInstruction ins(LLVMInstruction::Type::RemoveListItem, m_loopCondition);`
`441`		`- ins.workList = list;`
	`441`	`+ ins.targetList = list;`
`442`	`442`	`createOp(ins, Compiler::StaticType::Void, Compiler::StaticType::Number, { index });`
`443`	`443`	`m_utils.createListPtr(list);`
`444`	`444`	`}`
`445`	`445`
`446`	`446`	`void LLVMCodeBuilder::createListAppend(List list, CompilerValue item)`
`447`	`447`	`{`
`448`	`448`	`LLVMInstruction ins(LLVMInstruction::Type::AppendToList, m_loopCondition);`
`449`		`- ins.workList = list;`
	`449`	`+ ins.targetList = list;`
`450`	`450`	`createOp(ins, Compiler::StaticType::Void, Compiler::StaticType::Unknown, { item });`
`451`	`451`	`m_utils.createListPtr(list);`
`452`	`452`	`}`
`453`	`453`
`454`	`454`	`void LLVMCodeBuilder::createListInsert(List list, CompilerValue index, CompilerValue *item)`
`455`	`455`	`{`
`456`	`456`	`LLVMInstruction ins(LLVMInstruction::Type::InsertToList, m_loopCondition);`
`457`		`- ins.workList = list;`
	`457`	`+ ins.targetList = list;`
`458`	`458`	`createOp(ins, Compiler::StaticType::Void, { Compiler::StaticType::Number, Compiler::StaticType::Unknown }, { index, item });`
`459`	`459`	`m_utils.createListPtr(list);`
`460`	`460`	`}`
`461`	`461`
`462`	`462`	`void LLVMCodeBuilder::createListReplace(List list, CompilerValue index, CompilerValue *item)`
`463`	`463`	`{`
`464`	`464`	`LLVMInstruction ins(LLVMInstruction::Type::ListReplace, m_loopCondition);`
`465`		`- ins.workList = list;`
	`465`	`+ ins.targetList = list;`
`466`	`466`	`createOp(ins, Compiler::StaticType::Void, { Compiler::StaticType::Number, Compiler::StaticType::Unknown }, { index, item });`
`467`	`467`	`m_utils.createListPtr(list);`
`468`	`468`	`}`