[ASM] Fix function duplication error

tgtakaoka · Mar 18, 2024 · 08ffe30 · 08ffe30
1 parent 0959047
commit 08ffe30
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 0 deletions.
diff --git a/cli/asm_commander.cpp b/cli/asm_commander.cpp
@@ -60,6 +60,7 @@ int AsmCommander::assemble() {
             fprintf(stderr, "%s: Pass %d\n", _input_name, ++pass);
         prev.swap(memory);
         symbols.copy(_driver.symbols());
+        _driver.symbols().clearFunctions();
         memory.clear();
         listout.clear();
         errorout.clear();

diff --git a/driver/symbol_store.cpp b/driver/symbol_store.cpp
@@ -38,6 +38,10 @@ void SymbolStoreImpl::copy(const SymbolStoreImpl &other) {
 void SymbolStoreImpl::clear() {
     _symbols.clear();
     _variables.clear();
+    clearFunctions();
+}
+
+void SymbolStoreImpl::clearFunctions() {
     _functions.clear();
 }
 

diff --git a/driver/symbol_store.h b/driver/symbol_store.h
@@ -44,6 +44,7 @@ struct SymbolStoreImpl final : SymbolStore {
     bool operator!=(const SymbolStoreImpl &other) const { return !(*this == other); }
     void copy(const SymbolStoreImpl &other);
     void clear();
+    void clearFunctions();
 
     // SymbolTable
     const char *lookupValue(uint32_t) const override { return nullptr; }