diff options
| -rw-r--r-- | src/wasm-traversal.h | 20 | ||||
| -rw-r--r-- | test/passes/metrics.txt | 4 |
2 files changed, 20 insertions, 4 deletions
diff --git a/src/wasm-traversal.h b/src/wasm-traversal.h index 0b8097f56..47f6984dd 100644 --- a/src/wasm-traversal.h +++ b/src/wasm-traversal.h @@ -176,6 +176,7 @@ struct Walker : public VisitorType { setFunction(func); static_cast<SubType*>(this)->doWalkFunction(func); static_cast<SubType*>(this)->visitFunction(func); + setFunction(nullptr); } // override this to provide custom functionality @@ -183,10 +184,25 @@ struct Walker : public VisitorType { walk(func->body); } + void walkTable(Table* table) { + for (auto& segment : table->segments) { + walk(segment.offset); + } + static_cast<SubType*>(this)->visitTable(table); + } + + void walkMemory(Memory* memory) { + for (auto& segment : memory->segments) { + walk(segment.offset); + } + static_cast<SubType*>(this)->visitMemory(memory); + } + void walkModule(Module* module) { setModule(module); static_cast<SubType*>(this)->doWalkModule(module); static_cast<SubType*>(this)->visitModule(module); + setModule(nullptr); } // override this to provide custom functionality @@ -208,8 +224,8 @@ struct Walker : public VisitorType { for (auto& curr : module->functions) { self->walkFunction(curr.get()); } - self->visitTable(&module->table); - self->visitMemory(&module->memory); + self->walkTable(&module->table); + self->walkMemory(&module->memory); } // Walk implementation. We don't use recursion as ASTs may be highly diff --git a/test/passes/metrics.txt b/test/passes/metrics.txt index aee952bf5..2ab45b440 100644 --- a/test/passes/metrics.txt +++ b/test/passes/metrics.txt @@ -2,11 +2,11 @@ Counts [funcs] : 1 [memory-data] : 9 [table-data] : 3 - [total] : 24 + [total] : 26 [vars] : 1 binary : 1 block : 1 - const : 12 + const : 14 drop : 6 if : 4 (module |