diff options
author | Sam Clegg <sbc@chromium.org> | 2020-10-14 21:10:26 -0500 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-10-14 19:10:26 -0700 |
commit | 9c5df069cc466d904c8faa1888095e84ae74d404 (patch) | |
tree | c8f69e0c526428d2849d45be1154ed45dfa77868 /src/wasm/wasm-s-parser.cpp | |
parent | 6216becd5e8d93cd17c758a63f24db4494719e2c (diff) | |
download | binaryen-9c5df069cc466d904c8faa1888095e84ae74d404.tar.gz binaryen-9c5df069cc466d904c8faa1888095e84ae74d404.tar.bz2 binaryen-9c5df069cc466d904c8faa1888095e84ae74d404.zip |
Assign import names consistently between text and binaryn reader (#3238)
The s-parser was assigning numbers names per-type where as
the binaryn reader was using the global import count as the
number to append.
This change switches to use per-element count which I think
it preferable as it increases the stability of the auto-generated
names. e.g. memory is now always named `$mimport0`.
Diffstat (limited to 'src/wasm/wasm-s-parser.cpp')
-rw-r--r-- | src/wasm/wasm-s-parser.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/wasm/wasm-s-parser.cpp b/src/wasm/wasm-s-parser.cpp index 462d440d8..d3367d3f6 100644 --- a/src/wasm/wasm-s-parser.cpp +++ b/src/wasm/wasm-s-parser.cpp @@ -2366,9 +2366,9 @@ void SExpressionWasmBuilder::parseImport(Element& s) { name = Name("gimport$" + std::to_string(globalCounter++)); globalNames.push_back(name); } else if (kind == ExternalKind::Memory) { - name = Name("mimport$" + std::to_string(0)); + name = Name("mimport$" + std::to_string(memoryCounter++)); } else if (kind == ExternalKind::Table) { - name = Name("timport$" + std::to_string(0)); + name = Name("timport$" + std::to_string(tableCounter++)); } else if (kind == ExternalKind::Event) { name = Name("eimport$" + std::to_string(eventCounter++)); eventNames.push_back(name); |