LLVMCodeBuilder: Implement remove list item

Author: adazem009

src/dev/engine/internal/icodebuilder.h

@@ -57,6 +57,7 @@ class ICodeBuilder
         virtual void createVariableWrite(Variable *variable) = 0;
 
         virtual void createListClear(List *list) = 0;
+        virtual void createListRemove(List *list) = 0;
 
         virtual void beginIfStatement() = 0;
         virtual void beginElseBranch() = 0;

src/dev/engine/internal/llvm/llvmcodebuilder.cpp

@@ -484,6 +484,15 @@ std::shared_ptr<ExecutableCode> LLVMCodeBuilder::finalize()
                 break;
             }
 
+            case LLVMInstruction::Type::RemoveListItem: {
+                assert(step.args.size() == 1);
+                const auto &arg = step.args[0];
+                const LLVMListPtr &listPtr = m_listPtrs[step.workList];
+                llvm::Value *index = m_builder.CreateFPToUI(castValue(arg.second, arg.first), m_builder.getInt64Ty());
+                m_builder.CreateCall(resolve_list_remove(), { listPtr.ptr, index });
+                break;
+            }
+
             case LLVMInstruction::Type::Yield:
                 if (!m_warp) {
                     freeHeap();
@@ -946,6 +955,13 @@ void LLVMCodeBuilder::createListClear(List *list)
     m_listPtrs[list] = LLVMListPtr();
 }
 
+void LLVMCodeBuilder::createListRemove(List *list)
+{
+    LLVMInstruction &ins = createOp(LLVMInstruction::Type::RemoveListItem, Compiler::StaticType::Void, Compiler::StaticType::Number, 1);
+    ins.workList = list;
+    m_listPtrs[list] = LLVMListPtr();
+}
+
 void LLVMCodeBuilder::beginIfStatement()
 {
     LLVMInstruction ins(LLVMInstruction::Type::BeginIf);
@@ -1842,6 +1858,12 @@ llvm::FunctionCallee LLVMCodeBuilder::resolve_list_clear()
     return resolveFunction("list_clear", llvm::FunctionType::get(m_builder.getInt1Ty(), { listPtr }, false));
 }
 
+llvm::FunctionCallee LLVMCodeBuilder::resolve_list_remove()
+{
+    llvm::Type *listPtr = llvm::PointerType::get(llvm::Type::getInt8Ty(m_ctx), 0);
+    return resolveFunction("list_remove", llvm::FunctionType::get(m_builder.getInt1Ty(), { listPtr, m_builder.getInt64Ty() }, false));
+}
+
 llvm::FunctionCallee LLVMCodeBuilder::resolve_strcasecmp()
 {
     llvm::Type *pointerType = llvm::PointerType::get(llvm::Type::getInt8Ty(m_ctx), 0);

src/dev/engine/internal/llvm/llvmcodebuilder.h

@@ -63,6 +63,7 @@ class LLVMCodeBuilder : public ICodeBuilder
         void createVariableWrite(Variable *variable) override;
 
         void createListClear(List *list) override;
+        void createListRemove(List *list) override;
 
         void beginIfStatement() override;
         void beginElseBranch() override;
@@ -135,6 +136,7 @@ class LLVMCodeBuilder : public ICodeBuilder
         llvm::FunctionCallee resolve_value_greater();
         llvm::FunctionCallee resolve_value_lower();
         llvm::FunctionCallee resolve_list_clear();
+        llvm::FunctionCallee resolve_list_remove();
         llvm::FunctionCallee resolve_strcasecmp();
 
         Target *m_target = nullptr;

src/dev/engine/internal/llvm/llvminstruction.h

@@ -43,6 +43,7 @@ struct LLVMInstruction
             WriteVariable,
             ReadVariable,
             ClearList,
+            RemoveListItem,
             Yield,
             BeginIf,
             BeginElse,

test/dev/llvm/llvmcodebuilder_test.cpp

@@ -1974,6 +1974,48 @@ TEST_F(LLVMCodeBuilderTest, ClearList)
     ASSERT_EQ(localList3->toString(), strings[localList3.get()]);
 }
 
+TEST_F(LLVMCodeBuilderTest, RemoveFromList)
+{
+    EngineMock engine;
+    Stage stage;
+    Sprite sprite;
+    sprite.setEngine(&engine);
+    EXPECT_CALL(engine, stage()).WillRepeatedly(Return(&stage));
+
+    std::unordered_map<List *, std::string> strings;
+
+    auto globalList = std::make_shared<List>("", "");
+    stage.addList(globalList);
+
+    auto localList = std::make_shared<List>("", "");
+    sprite.addList(localList);
+
+    globalList->append(1);
+    globalList->append(2);
+    globalList->append(3);
+
+    localList->append("Lorem");
+    localList->append("ipsum");
+    localList->append("dolor");
+    localList->append("sit");
+    strings[localList.get()] = localList->toString();
+
+    createBuilder(&sprite, true);
+
+    m_builder->addConstValue(1);
+    m_builder->createListRemove(globalList.get());
+
+    m_builder->addConstValue(3);
+    m_builder->createListRemove(localList.get());
+
+    auto code = m_builder->finalize();
+    auto ctx = code->createExecutionContext(&sprite);
+    code->run(ctx.get());
+
+    ASSERT_EQ(globalList->toString(), "13");
+    ASSERT_EQ(localList->toString(), "Lorem ipsum dolor");
+}
+
 TEST_F(LLVMCodeBuilderTest, Yield)
 {
     auto build = [this]() {

test/mocks/codebuildermock.h

@@ -47,6 +47,7 @@ class CodeBuilderMock : public ICodeBuilder
         MOCK_METHOD(void, createVariableWrite, (Variable *), (override));
 
         MOCK_METHOD(void, createListClear, (List *), (override));
+        MOCK_METHOD(void, createListRemove, (List *), (override));
 
         MOCK_METHOD(void, beginIfStatement, (), (override));
         MOCK_METHOD(void, beginElseBranch, (), (override));