LLVMCodeBuilder: Fix loop scope memory leaks

Author: adazem009

src/engine/internal/llvm/llvmcodebuilder.cpp

@@ -1590,7 +1590,7 @@ void LLVMCodeBuilder::createVariableWrite(Variable *variable, CompilerValue *val
 
     if (m_loopScope >= 0) {
         auto scope = m_loopScopes[m_loopScope];
-        m_variablePtrs[variable].loopVariableWrites[scope].push_back(m_instructions.back());
+        m_variablePtrs[variable].loopVariableWrites[scope.get()].push_back(m_instructions.back());
     }
 
     m_variableInstructions.push_back(m_instructions.back());
@@ -1627,7 +1627,7 @@ void LLVMCodeBuilder::createListAppend(List *list, CompilerValue *item)
 
     if (m_loopScope >= 0) {
         auto scope = m_loopScopes[m_loopScope];
-        m_listPtrs[list].loopListWrites[scope].push_back(m_instructions.back());
+        m_listPtrs[list].loopListWrites[scope.get()].push_back(m_instructions.back());
     }
 
     m_listInstructions.push_back(m_instructions.back());
@@ -1644,7 +1644,7 @@ void LLVMCodeBuilder::createListInsert(List *list, CompilerValue *index, Compile
 
     if (m_loopScope >= 0) {
         auto scope = m_loopScopes[m_loopScope];
-        m_listPtrs[list].loopListWrites[scope].push_back(m_instructions.back());
+        m_listPtrs[list].loopListWrites[scope.get()].push_back(m_instructions.back());
     }
 
     m_listInstructions.push_back(m_instructions.back());
@@ -1661,7 +1661,7 @@ void LLVMCodeBuilder::createListReplace(List *list, CompilerValue *index, Compil
 
     if (m_loopScope >= 0) {
         auto scope = m_loopScopes[m_loopScope];
-        m_listPtrs[list].loopListWrites[scope].push_back(m_instructions.back());
+        m_listPtrs[list].loopListWrites[scope.get()].push_back(m_instructions.back());
     }
 
     m_listInstructions.push_back(m_instructions.back());
@@ -1878,8 +1878,8 @@ void LLVMCodeBuilder::pushLoopScope(bool buildPhase)
 
         if (m_loopScope >= 0) {
             auto currentScope = m_loopScopes[m_loopScope];
-            currentScope->childScopes.push_back(scope);
-            scope->parentScope = currentScope;
+            currentScope->childScopes.push_back(scope.get());
+            scope->parentScope = currentScope.get();
         }
 
         m_loopScope = m_loopScopes.size() - 1;
@@ -2511,9 +2511,9 @@ LLVMRegister *LLVMCodeBuilder::createOp(const LLVMInstruction &ins, Compiler::St
     return nullptr;
 }
 
-std::shared_ptr<LLVMLoopScope> LLVMCodeBuilder::currentLoopScope() const
+LLVMLoopScope *LLVMCodeBuilder::currentLoopScope() const
 {
-    return m_loopScope >= 0 ? m_loopScopes[m_loopScope] : nullptr;
+    return m_loopScope >= 0 ? m_loopScopes[m_loopScope].get() : nullptr;
 }
 
 void LLVMCodeBuilder::createValueStore(LLVMRegister *reg, llvm::Value *targetPtr, Compiler::StaticType sourceType, Compiler::StaticType targetType)

src/engine/internal/llvm/llvmcodebuilder.h

@@ -157,7 +157,7 @@ class LLVMCodeBuilder : public ICodeBuilder
         LLVMRegister *createOp(LLVMInstruction::Type type, Compiler::StaticType retType, const Compiler::ArgTypes &argTypes = {}, const Compiler::Args &args = {});
         LLVMRegister *createOp(const LLVMInstruction &ins, Compiler::StaticType retType, Compiler::StaticType argType, const Compiler::Args &args);
         LLVMRegister *createOp(const LLVMInstruction &ins, Compiler::StaticType retType, const Compiler::ArgTypes &argTypes = {}, const Compiler::Args &args = {});
-        std::shared_ptr<LLVMLoopScope> currentLoopScope() const;
+        LLVMLoopScope *currentLoopScope() const;
 
         void createValueStore(LLVMRegister *reg, llvm::Value *targetPtr, Compiler::StaticType sourceType, Compiler::StaticType targetType);
         void createReusedValueStore(LLVMRegister *reg, llvm::Value *targetPtr, Compiler::StaticType sourceType, Compiler::StaticType targetType);

src/engine/internal/llvm/llvminstruction.h

@@ -78,7 +78,7 @@ struct LLVMInstruction
             ProcedureArg
         };
 
-        LLVMInstruction(Type type, std::shared_ptr<LLVMLoopScope> loopScope, bool loopCondition) :
+        LLVMInstruction(Type type, LLVMLoopScope *loopScope, bool loopCondition) :
             type(type),
             loopScope(loopScope),
             loopCondition(loopCondition)
@@ -95,7 +95,7 @@ struct LLVMInstruction
         List *workList = nullptr;         // for lists
         BlockPrototype *procedurePrototype = nullptr;
         size_t procedureArgIndex = 0;
-        std::shared_ptr<LLVMLoopScope> loopScope;
+        LLVMLoopScope *loopScope = nullptr;
         bool loopCondition = false; // whether the instruction is part of a loop condition
 };
 

src/engine/internal/llvm/llvmlistptr.h

@@ -28,7 +28,7 @@ struct LLVMListPtr
         Compiler::StaticType type = Compiler::StaticType::Unknown;
 
         // Used in build phase to check the type safety of lists in loops
-        std::unordered_map<std::shared_ptr<LLVMLoopScope>, std::vector<std::shared_ptr<LLVMInstruction>>> loopListWrites; // loop scope, write instructions
+        std::unordered_map<LLVMLoopScope *, std::vector<std::shared_ptr<LLVMInstruction>>> loopListWrites; // loop scope, write instructions
 };
 
 } // namespace libscratchcpp

src/engine/internal/llvm/llvmloopscope.h

@@ -11,8 +11,8 @@ namespace libscratchcpp
 struct LLVMLoopScope
 {
         bool containsYield = false;
-        std::shared_ptr<LLVMLoopScope> parentScope;
-        std::vector<std::shared_ptr<LLVMLoopScope>> childScopes;
+        LLVMLoopScope *parentScope = nullptr;
+        std::vector<LLVMLoopScope *> childScopes;
 };
 
 } // namespace libscratchcpp

src/engine/internal/llvm/llvmvariableptr.h

@@ -27,7 +27,7 @@ struct LLVMVariablePtr
         bool changed = false;
 
         // Used in build phase to check the type safety of variables in loops
-        std::unordered_map<std::shared_ptr<LLVMLoopScope>, std::vector<std::shared_ptr<LLVMInstruction>>> loopVariableWrites; // loop scope, write instructions
+        std::unordered_map<LLVMLoopScope *, std::vector<std::shared_ptr<LLVMInstruction>>> loopVariableWrites; // loop scope, write instructions
 };
 
 } // namespace libscratchcpp