fix: crash by block destroy

ganyao114 · Nov 8, 2024 · 6f1c3eb · 6f1c3eb
1 parent 4b95372
commit 6f1c3eb
Show file tree

Hide file tree

Showing 7 changed files with 19 additions and 11 deletions.
diff --git a/source/runtime/backend/arm64/jit/translator.cpp b/source/runtime/backend/arm64/jit/translator.cpp
@@ -896,6 +896,10 @@ void JitTranslator::EmitXor(ir::Inst* inst) {}
 
 void JitTranslator::EmitGoto(ir::Inst* inst) {}
 
+void JitTranslator::EmitSelect(ir::Inst* inst) {}
+
+void JitTranslator::EmitCondSelect(ir::Inst* inst) {}
+
 void JitTranslator::EmitZero(ir::Inst* inst) {}
 
 #undef masm

diff --git a/source/runtime/backend/mem_map.cpp b/source/runtime/backend/mem_map.cpp
@@ -208,7 +208,7 @@ class MemMap::Impl {
 
     bool Unmap(void* mem, u32 size) { return munmap(mem, size); }
 
-    u8* GetBackend() const { return backing_memory; }
+    [[nodiscard]] u8* GetBackend() const { return backing_memory; }
 
     virtual ~Impl() = default;
 

diff --git a/source/runtime/common/mem_arena.h b/source/runtime/common/mem_arena.h
@@ -26,7 +26,7 @@ class MemArena {
 
 private:
     struct NonTrivialDummy {
-        NonTrivialDummy() noexcept {}
+        NonTrivialDummy() noexcept = default;
     };
 
     struct Chunk {

diff --git a/source/runtime/common/slab_alloc.h b/source/runtime/common/slab_alloc.h
@@ -17,9 +17,9 @@ class SlabAllocator {
 
     void Initialize(size_t size) { size_ = size; }
 
-    constexpr std::size_t GetSize() const { return size_; }
+    [[nodiscard]] std::size_t GetSize() const { return size_; }
 
-    Node* GetHead() const { return head; }
+    [[nodiscard]] Node* GetHead() const { return head; }
 
     void* Allocate();
 
@@ -45,11 +45,11 @@ template <typename T> class SlabHeap {
         }
     }
 
-    constexpr bool Contains(uintptr_t addr) const { return start <= addr && addr < end; }
+    [[nodiscard]] constexpr bool Contains(uintptr_t addr) const { return start <= addr && addr < end; }
 
-    constexpr std::size_t GetSlabHeapSize() const { return (end - start) / GetObjectSize(); }
+    [[nodiscard]] constexpr std::size_t GetSlabHeapSize() const { return (end - start) / GetObjectSize(); }
 
-    constexpr std::size_t GetObjectSize() const { return allocator.GetSize(); }
+    [[nodiscard]] constexpr std::size_t GetObjectSize() const { return allocator.GetSize(); }
 
     std::size_t GetObjectIndexImpl(const void* obj) const {
         return (reinterpret_cast<uintptr_t>(obj) - start) / GetObjectSize();
@@ -74,12 +74,12 @@ template <typename T> class SlabHeap {
     }
 
     void Free(void* obj) {
-        assert(Contains(reinterpret_cast<uintptr_t>(obj)));
+        ASSERT(Contains(reinterpret_cast<uintptr_t>(obj)));
         allocator.Free(obj);
     }
 
     void Initialize(void* memory, size_t memory_size) {
-        assert(memory != nullptr);
+        ASSERT(memory != nullptr);
 
         auto object_size = sizeof(T);
 

diff --git a/source/runtime/ir/block.cpp b/source/runtime/ir/block.cpp
@@ -43,6 +43,9 @@ void Block::DestroyInst(Inst* inst) {
 }
 
 void Block::DestroyInstrs() {
+    for (auto& inst : inst_list) {
+        inst.DestroyArgs();
+    }
     for (auto it = inst_list.begin(); it != inst_list.end();) {
         auto pre = it;
         it = inst_list.erase(it);

diff --git a/source/runtime/ir/instr.cpp b/source/runtime/ir/instr.cpp
@@ -267,9 +267,8 @@ void Inst::DestroyArg(u8 arg_idx) {
             }
         }
         params.Destroy();
-    } else {
-        arg = {};
     }
+    arg = {};
 }
 
 void Inst::DestroyArgs() {

diff --git a/source/runtime/ir/ir.inc b/source/runtime/ir/ir.inc
@@ -16,6 +16,8 @@ INST(CompareAndSwap, Value, Value, Value, Value)
 INST(UniformBarrier, Void)
 INST(Goto, Value, BOOL)
 INST(NotGoto, Value, BOOL)
+INST(Select, Value, BOOL, Value, Value)
+INST(CondSelect, Value, Cond, Value, Value)
 INST(BindLabel, Void, Value)
 INST(CallLambda, Value, Lambda, Value, Value, Value)
 INST(CallLocation, Value, Lambda, Params)