Remove obsolete scope management methods

Author: adazem009

src/engine/internal/llvm/instructions/control.cpp

@@ -119,7 +119,6 @@ LLVMInstruction *Control::buildBeginIf(LLVMInstruction *ins)
     m_builder.SetInsertPoint(statement.body);
 
     m_utils.ifStatements().push_back(statement);
-    m_utils.pushScopeLevel();
 
     return ins->next;
 }
@@ -135,7 +134,6 @@ LLVMInstruction *Control::buildBeginElse(LLVMInstruction *ins)
     // Jump to the branch after the if statement
     assert(!statement.afterIf);
     statement.afterIf = llvm::BasicBlock::Create(llvmCtx, "", function);
-    m_utils.freeScopeHeap();
     m_builder.CreateBr(statement.afterIf);
 
     // Create else branch
@@ -157,7 +155,6 @@ LLVMInstruction *Control::buildEndIf(LLVMInstruction *ins)
     auto &ifStatements = m_utils.ifStatements();
     assert(!ifStatements.empty());
     LLVMIfStatement &statement = ifStatements.back();
-    m_utils.freeScopeHeap();
 
     // Jump to the branch after the if statement
     if (!statement.afterIf)
@@ -176,7 +173,6 @@ LLVMInstruction *Control::buildEndIf(LLVMInstruction *ins)
     m_builder.SetInsertPoint(statement.afterIf);
 
     ifStatements.pop_back();
-    m_utils.popScopeLevel();
 
     return ins->next;
 }
@@ -236,7 +232,6 @@ LLVMInstruction *Control::buildBeginRepeatLoop(LLVMInstruction *ins)
     m_builder.SetInsertPoint(body);
 
     m_utils.loops().push_back(loop);
-    m_utils.pushScopeLevel();
 
     return ins->next;
 }
@@ -274,7 +269,6 @@ LLVMInstruction *Control::buildBeginWhileLoop(LLVMInstruction *ins)
 
     // Switch to body branch
     m_builder.SetInsertPoint(body);
-    m_utils.pushScopeLevel();
 
     return ins->next;
 }
@@ -300,7 +294,6 @@ LLVMInstruction *Control::buildBeginRepeatUntilLoop(LLVMInstruction *ins)
 
     // Switch to body branch
     m_builder.SetInsertPoint(body);
-    m_utils.pushScopeLevel();
 
     return ins->next;
 }
@@ -331,14 +324,12 @@ LLVMInstruction *Control::buildEndLoop(LLVMInstruction *ins)
     }
 
     // Jump to the condition branch
-    m_utils.freeScopeHeap();
     m_builder.CreateBr(loop.conditionBranch);
 
     // Switch to the branch after the loop
     m_builder.SetInsertPoint(loop.afterLoop);
 
     loops.pop_back();
-    m_utils.popScopeLevel();
 
     return ins->next;
 }
@@ -351,7 +342,6 @@ LLVMInstruction *Control::buildStop(LLVMInstruction *ins)
 
 LLVMInstruction *Control::buildStopWithoutSync(LLVMInstruction *ins)
 {
-    m_utils.freeScopeHeap();
     m_builder.CreateBr(m_utils.endBranch());
     llvm::BasicBlock *nextBranch = llvm::BasicBlock::Create(m_utils.llvmCtx(), "", m_utils.function());
     m_builder.SetInsertPoint(nextBranch);

src/engine/internal/llvm/instructions/procedures.cpp

@@ -38,7 +38,6 @@ LLVMInstruction *Procedures::buildCallProcedure(LLVMInstruction *ins)
 
     assert(ins->procedurePrototype);
     assert(ins->args.size() == ins->procedurePrototype->argumentTypes().size());
-    m_utils.freeScopeHeap();
     m_utils.syncVariables();
 
     std::string name = m_utils.scriptFunctionName(ins->procedurePrototype);

src/engine/internal/llvm/llvmbuildutils.cpp

@@ -56,9 +56,6 @@ void LLVMBuildUtils::init(llvm::Function *function, BlockPrototype *procedurePro
     if (m_procedurePrototype && m_warp)
         m_function->addFnAttr(llvm::Attribute::InlineHint);
 
-    m_stringHeap.clear();
-    pushScopeLevel();
-
     // Init coroutine
     if (!m_warp)
         m_coroutine = std::make_unique<LLVMCoroutine>(m_ctx->module(), &m_builder, m_function);
@@ -123,9 +120,6 @@ void LLVMBuildUtils::init(llvm::Function *function, BlockPrototype *procedurePro
 
 void LLVMBuildUtils::end(LLVMInstruction *lastInstruction, LLVMRegister *lastConstant)
 {
-    assert(m_stringHeap.size() == 1);
-    freeScopeHeap();
-
     // Sync
     llvm::BasicBlock *syncBranch = llvm::BasicBlock::Create(m_llvmCtx, "sync", m_function);
     m_builder.CreateBr(syncBranch);
@@ -384,31 +378,6 @@ void LLVMBuildUtils::reloadLists()
     }
 }
 
-void LLVMBuildUtils::pushScopeLevel()
-{
-    m_stringHeap.push_back({});
-}
-
-void LLVMBuildUtils::popScopeLevel()
-{
-    freeScopeHeap();
-    m_stringHeap.pop_back();
-}
-
-void LLVMBuildUtils::freeScopeHeap()
-{
-    if (m_stringHeap.empty())
-        return;
-
-    // Free strings in current scope
-    auto &heap = m_stringHeap.back();
-
-    for (llvm::Value *ptr : heap)
-        m_builder.CreateCall(m_functions.resolve_string_pool_free(), { ptr });
-
-    heap.clear();
-}
-
 std::vector<LLVMIfStatement> &LLVMBuildUtils::ifStatements()
 {
     return m_ifStatements;

src/engine/internal/llvm/llvmbuildutils.h

@@ -74,11 +74,6 @@ class LLVMBuildUtils
         void reloadVariables();
         void reloadLists();
 
-        void pushScopeLevel();
-        void popScopeLevel();
-
-        void freeScopeHeap();
-
         std::vector<LLVMIfStatement> &ifStatements();
         std::vector<LLVMLoop> &loops();
 
@@ -178,8 +173,6 @@ class LLVMBuildUtils
         std::unordered_map<List *, size_t> m_targetListMap;
         std::unordered_map<List *, LLVMListPtr> m_listPtrs;
 
-        std::vector<std::vector<llvm::Value *>> m_stringHeap; // scopes
-
         std::vector<LLVMIfStatement> m_ifStatements;
         std::vector<LLVMLoop> m_loops;
 };