From 77c66027f0dcbd7160f78c5de4943372836ab142 Mon Sep 17 00:00:00 2001 From: Alon Zakai Date: Thu, 1 Nov 2018 13:34:53 -0700 Subject: Emit imports before defined things in text format (#1715) That is the correct order in the text format, wabt errors otherwise. See AssemblyScript/assemblyscript#310 --- src/ir/module-utils.h | 30 +++++++++++++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) (limited to 'src/ir/module-utils.h') diff --git a/src/ir/module-utils.h b/src/ir/module-utils.h index 1d0512401..d6ee50dd0 100644 --- a/src/ir/module-utils.h +++ b/src/ir/module-utils.h @@ -128,7 +128,35 @@ inline void copyModule(Module& in, Module& out) { out.debugInfoFileNames = in.debugInfoFileNames; } -// Convenient iteration over imported/non-imported functions/globals +// Convenient iteration over imported/non-imported module elements + +template +inline void iterImportedMemories(Module& wasm, T visitor) { + if (wasm.memory.exists && wasm.memory.imported()) { + visitor(&wasm.memory); + } +} + +template +inline void iterDefinedMemories(Module& wasm, T visitor) { + if (wasm.memory.exists && !wasm.memory.imported()) { + visitor(&wasm.memory); + } +} + +template +inline void iterImportedTables(Module& wasm, T visitor) { + if (wasm.table.exists && wasm.table.imported()) { + visitor(&wasm.table); + } +} + +template +inline void iterDefinedTables(Module& wasm, T visitor) { + if (wasm.table.exists && !wasm.table.imported()) { + visitor(&wasm.table); + } +} template inline void iterImportedGlobals(Module& wasm, T visitor) { -- cgit v1.2.3