LLVMCodeBuilder: Store list read/write instructions

scratchcpp · Jan 18, 2025 · 0fdcc76 · 0fdcc76
1 parent c1674b2
commit 0fdcc76
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 0 deletions.
diff --git a/src/engine/internal/llvm/llvmcodebuilder.cpp b/src/engine/internal/llvm/llvmcodebuilder.cpp
@@ -1319,6 +1319,7 @@ CompilerValue *LLVMCodeBuilder::addListItem(List *list, CompilerValue *index)
     ins->functionReturnReg = ret.get();
 
     m_instructions.push_back(ins);
+    m_listInstructions.push_back(m_instructions.back());
     return addReg(ret, ins);
 }
 
@@ -1330,6 +1331,7 @@ CompilerValue *LLVMCodeBuilder::addListItemIndex(List *list, CompilerValue *item
     if (m_listPtrs.find(list) == m_listPtrs.cend())
         m_listPtrs[list] = LLVMListPtr();
 
+    m_listInstructions.push_back(m_instructions.back());
     return createOp(ins, Compiler::StaticType::Number, Compiler::StaticType::Unknown, { item });
 }
 
@@ -1341,6 +1343,7 @@ CompilerValue *LLVMCodeBuilder::addListContains(List *list, CompilerValue *item)
     if (m_listPtrs.find(list) == m_listPtrs.cend())
         m_listPtrs[list] = LLVMListPtr();
 
+    m_listInstructions.push_back(m_instructions.back());
     return createOp(ins, Compiler::StaticType::Bool, Compiler::StaticType::Unknown, { item });
 }
 
@@ -1593,6 +1596,8 @@ void LLVMCodeBuilder::createListAppend(List *list, CompilerValue *item)
 
     if (m_listPtrs.find(list) == m_listPtrs.cend())
         m_listPtrs[list] = LLVMListPtr();
+
+    m_listInstructions.push_back(m_instructions.back());
 }
 
 void LLVMCodeBuilder::createListInsert(List *list, CompilerValue *index, CompilerValue *item)
@@ -1603,6 +1608,8 @@ void LLVMCodeBuilder::createListInsert(List *list, CompilerValue *index, Compile
 
     if (m_listPtrs.find(list) == m_listPtrs.cend())
         m_listPtrs[list] = LLVMListPtr();
+
+    m_listInstructions.push_back(m_instructions.back());
 }
 
 void LLVMCodeBuilder::createListReplace(List *list, CompilerValue *index, CompilerValue *item)
@@ -1613,6 +1620,8 @@ void LLVMCodeBuilder::createListReplace(List *list, CompilerValue *index, Compil
 
     if (m_listPtrs.find(list) == m_listPtrs.cend())
         m_listPtrs[list] = LLVMListPtr();
+
+    m_listInstructions.push_back(m_instructions.back());
 }
 
 void LLVMCodeBuilder::beginIfStatement(CompilerValue *cond)

diff --git a/src/engine/internal/llvm/llvmcodebuilder.h b/src/engine/internal/llvm/llvmcodebuilder.h
@@ -238,6 +238,7 @@ class LLVMCodeBuilder : public ICodeBuilder
         std::vector<long> m_loopScopeTree;
         bool m_loopCondition = false; // whether we're currently compiling a loop condition
         std::vector<std::shared_ptr<LLVMInstruction>> m_variableInstructions;
+        std::vector<std::shared_ptr<LLVMInstruction>> m_listInstructions;
         std::vector<std::vector<llvm::Value *>> m_heap; // scopes
 
         std::shared_ptr<ExecutableCode> m_output;