Remove stop without sync instruction

Author: adazem009

include/scratchcpp/compiler.h

@@ -149,9 +149,9 @@ class LIBSCRATCHCPP_EXPORT Compiler
         void warp();
 
         void createYield();
+
         void createStop();
         void createThreadStop();
-        void createStopWithoutSync();
 
         void invalidateTarget();
 

src/engine/compiler.cpp

@@ -711,16 +711,6 @@ void Compiler::createThreadStop()
     impl->builder->createThreadStop();
 }
 
-/*!
- * Creates a stop script without synchronization instruction.\n
- * Use this if synchronization is not possible at the stop point.
- * \note Only use this when everything is synchronized, e. g. after a function call.
- */
-void Compiler::createStopWithoutSync()
-{
-    impl->builder->createStopWithoutSync();
-}
-
 /*!
  * Creates a sprite/stage invalidation point.\n
  * Use this if synchronization is not possible because the target has been deleted.

src/engine/internal/icodebuilder.h

@@ -100,7 +100,6 @@ class ICodeBuilder
 
         virtual void createStop() = 0;
         virtual void createThreadStop() = 0;
-        virtual void createStopWithoutSync() = 0;
 
         virtual void invalidateTarget() = 0;
 

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

@@ -64,10 +64,6 @@ ProcessResult Control::process(LLVMInstruction *ins)
             ret.next = buildThreadStop(ins);
             break;
 
-        case LLVMInstruction::Type::StopWithoutSync:
-            ret.next = buildStopWithoutSync(ins);
-            break;
-
         case LLVMInstruction::Type::InvalidateTarget:
             ret.next = buildInvalidateTarget(ins);
             break;
@@ -345,23 +341,19 @@ LLVMInstruction *Control::buildEndLoop(LLVMInstruction *ins)
 LLVMInstruction *Control::buildStop(LLVMInstruction *ins)
 {
     m_utils.syncVariables();
-    return buildStopWithoutSync(ins);
-}
-
-LLVMInstruction *Control::buildThreadStop(LLVMInstruction *ins)
-{
-    m_utils.syncVariables();
-    m_builder.CreateBr(m_utils.endThreadBranch());
 
+    m_builder.CreateBr(m_utils.endBranch());
     llvm::BasicBlock *nextBranch = llvm::BasicBlock::Create(m_utils.llvmCtx(), "", m_utils.function());
     m_builder.SetInsertPoint(nextBranch);
 
     return ins->next;
 }
 
-LLVMInstruction *Control::buildStopWithoutSync(LLVMInstruction *ins)
+LLVMInstruction *Control::buildThreadStop(LLVMInstruction *ins)
 {
-    m_builder.CreateBr(m_utils.endBranch());
+    m_utils.syncVariables();
+    m_builder.CreateBr(m_utils.endThreadBranch());
+
     llvm::BasicBlock *nextBranch = llvm::BasicBlock::Create(m_utils.llvmCtx(), "", m_utils.function());
     m_builder.SetInsertPoint(nextBranch);
 

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

@@ -28,7 +28,6 @@ class Control : public InstructionGroup
         LLVMInstruction *buildEndLoop(LLVMInstruction *ins);
         LLVMInstruction *buildStop(LLVMInstruction *ins);
         LLVMInstruction *buildThreadStop(LLVMInstruction *ins);
-        LLVMInstruction *buildStopWithoutSync(LLVMInstruction *ins);
         LLVMInstruction *buildInvalidateTarget(LLVMInstruction *ins);
 };
 

src/engine/internal/llvm/llvmcodebuilder.cpp

@@ -573,12 +573,6 @@ void LLVMCodeBuilder::createThreadStop()
     m_instructions.addInstruction(ins);
 }
 
-void LLVMCodeBuilder::createStopWithoutSync()
-{
-    auto ins = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::StopWithoutSync, m_loopCondition);
-    m_instructions.addInstruction(ins);
-}
-
 void LLVMCodeBuilder::invalidateTarget()
 {
     auto ins = std::make_shared<LLVMInstruction>(LLVMInstruction::Type::InvalidateTarget, m_loopCondition);

src/engine/internal/llvm/llvmcodebuilder.h

@@ -114,7 +114,6 @@ class LIBSCRATCHCPP_TEST_EXPORT LLVMCodeBuilder : public ICodeBuilder
 
         void createStop() override;
         void createThreadStop() override;
-        void createStopWithoutSync() override;
 
         void invalidateTarget() override;
 

src/engine/internal/llvm/llvminstruction.h

@@ -78,7 +78,6 @@ struct LLVMInstruction
             EndLoop,
             Stop,
             ThreadStop,
-            StopWithoutSync,
             InvalidateTarget,
             CallProcedure,
             ProcedureArg

test/compiler/compiler_test.cpp

@@ -1687,20 +1687,6 @@ TEST_F(CompilerTest, CreateThreadStop)
     compile(m_compiler.get(), block.get());
 }
 
-TEST_F(CompilerTest, CreateStopWithoutSync)
-{
-
-    auto block = std::make_shared<Block>("", "");
-
-    block->setCompileFunction([](Compiler *compiler) -> CompilerValue * {
-        EXPECT_CALL(*m_builder, createStopWithoutSync());
-        compiler->createStopWithoutSync();
-        return nullptr;
-    });
-
-    compile(m_compiler.get(), block.get());
-}
-
 TEST_F(CompilerTest, InvalidateTarget)
 {
 

test/mocks/codebuildermock.h

@@ -89,7 +89,6 @@ class CodeBuilderMock : public ICodeBuilder
 
         MOCK_METHOD(void, createStop, (), (override));
         MOCK_METHOD(void, createThreadStop, (), (override));
-        MOCK_METHOD(void, createStopWithoutSync, (), (override));
 
         MOCK_METHOD(void, invalidateTarget, (), (override));