Drop LLVMLoopScope

It was used by the old type analysis algorithm.

Author: adazem009

src/engine/internal/llvm/CMakeLists.txt

@@ -17,7 +17,6 @@ target_sources(scratchcpp
     llvmtypes.h
     llvmfunctions.cpp
     llvmfunctions.h
-    llvmloopscope.h
     llvmtypeanalyzer.cpp
     llvmtypeanalyzer.h
     llvmcompilercontext.cpp

src/engine/internal/llvm/llvmcodebuilder.cpp

@@ -23,7 +23,6 @@ namespace libscratchcpp
 
 class LLVMCompilerContext;
 class LLVMConstantRegister;
-class LLVMLoopScope;
 
 class LLVMCodeBuilder : public ICodeBuilder
 {
@@ -127,8 +126,6 @@ class LLVMCodeBuilder : public ICodeBuilder
         void createListMap();
         void pushScopeLevel();
         void popScopeLevel();
-        void pushLoopScope(bool buildPhase);
-        void popLoopScope();
 
         std::string getMainFunctionName(BlockPrototype *procedurePrototype);
         llvm::FunctionType *getMainFunctionType(BlockPrototype *procedurePrototype);
@@ -159,7 +156,6 @@ 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 = {});
-        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);
@@ -203,16 +199,10 @@ class LLVMCodeBuilder : public ICodeBuilder
         int m_defaultArgCount = 0;
         Compiler::CodeType m_codeType = Compiler::CodeType::Script;
 
-        long m_loopScope = -1; // index
-        std::vector<std::shared_ptr<LLVMLoopScope>> m_loopScopes;
-        long m_loopScopeCounter = 0; // replacement for m_loopScopes size in build phase
-        std::vector<long> m_loopScopeTree;
         bool m_loopCondition = false; // whether we're currently compiling a loop condition
         std::vector<LLVMInstruction *> m_variableInstructions;
         std::vector<LLVMInstruction *> m_listInstructions;
         std::vector<std::vector<llvm::Value *>> m_stringHeap; // scopes
-
-        std::shared_ptr<ExecutableCode> m_output;
 };
 
 } // namespace libscratchcpp

src/engine/internal/llvm/llvmcodebuilder.h

@@ -10,7 +10,6 @@ namespace libscratchcpp
 {
 
 class BlockPrototype;
-class LLVMLoopScope;
 
 struct LLVMInstruction
 {
@@ -81,9 +80,8 @@ struct LLVMInstruction
             ProcedureArg
         };
 
-        LLVMInstruction(Type type, LLVMLoopScope *loopScope, bool loopCondition) :
+        LLVMInstruction(Type type, bool loopCondition) :
             type(type),
-            loopScope(loopScope),
             loopCondition(loopCondition)
         {
         }
@@ -98,7 +96,6 @@ struct LLVMInstruction
         List *workList = nullptr;         // for lists
         BlockPrototype *procedurePrototype = nullptr;
         size_t procedureArgIndex = 0;
-        LLVMLoopScope *loopScope = nullptr;
         bool loopCondition = false; // whether the instruction is part of a loop condition
 
         // Linked list

src/engine/internal/llvm/llvminstruction.h

@@ -3,7 +3,6 @@
 #pragma once
 
 #include <scratchcpp/compiler.h>
-#include <unordered_map>
 
 namespace llvm
 {
@@ -15,7 +14,6 @@ class Value;
 namespace libscratchcpp
 {
 
-class LLVMLoopScope;
 class LLVMInstruction;
 
 struct LLVMListPtr
@@ -24,9 +22,6 @@ struct LLVMListPtr
         llvm::Value *dataPtr = nullptr;
         llvm::Value *sizePtr = nullptr;
         llvm::Value *allocatedSizePtr = nullptr;
-
-        // Used in build phase to check the type safety of lists in loops
-        std::unordered_map<LLVMLoopScope *, std::vector<LLVMInstruction *>> loopListWrites; // loop scope, write instructions
 };
 
 } // namespace libscratchcpp

src/engine/internal/llvm/llvmlistptr.h

@@ -3,7 +3,6 @@
 #pragma once
 
 #include <scratchcpp/compiler.h>
-#include <unordered_map>
 
 namespace llvm
 {
@@ -15,7 +14,6 @@ class Value;
 namespace libscratchcpp
 {
 
-class LLVMLoopScope;
 class LLVMInstruction;
 
 struct LLVMVariablePtr
@@ -24,9 +22,6 @@ struct LLVMVariablePtr
         llvm::Value *heapPtr = nullptr;
         bool onStack = false;
         bool changed = false;
-
-        // Used in build phase to check the type safety of variables in loops
-        std::unordered_map<LLVMLoopScope *, std::vector<LLVMInstruction *>> loopVariableWrites; // loop scope, write instructions
 };
 
 } // namespace libscratchcpp