diff options
author | Thomas Lively <7121787+tlively@users.noreply.github.com> | 2021-06-11 21:12:48 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-06-12 01:12:48 +0000 |
commit | aec8d12282b5279b80e79f21d54491db5d55278e (patch) | |
tree | 4f0325893fda3aa98ab970757e9d3cd2288f6603 /src/tools/wasm-split.cpp | |
parent | 446634a503116186a025d23375c430cb837e00f0 (diff) | |
download | binaryen-aec8d12282b5279b80e79f21d54491db5d55278e.tar.gz binaryen-aec8d12282b5279b80e79f21d54491db5d55278e.tar.bz2 binaryen-aec8d12282b5279b80e79f21d54491db5d55278e.zip |
[wasm-split] Add an option to emit a placeholder map (#3931)
The new instruction emits a file containing a map between placeholder index and
the name of the split out function that placeholder is replacing in the table.
This map is intended to be useful for debugging, as discussed in
https://github.com/emscripten-core/emscripten/issues/14330.
Diffstat (limited to 'src/tools/wasm-split.cpp')
-rw-r--r-- | src/tools/wasm-split.cpp | 26 |
1 files changed, 24 insertions, 2 deletions
diff --git a/src/tools/wasm-split.cpp b/src/tools/wasm-split.cpp index 4ac295d0e..261c62a68 100644 --- a/src/tools/wasm-split.cpp +++ b/src/tools/wasm-split.cpp @@ -61,6 +61,7 @@ struct WasmSplitOptions : ToolOptions { bool verbose = false; bool emitBinary = true; bool symbolMap = false; + bool placeholderMap = false; // TODO: Remove this. See the comment in wasm-binary.h. bool emitModuleNames = false; @@ -180,6 +181,13 @@ WasmSplitOptions::WasmSplitOptions() {Mode::Split}, Options::Arguments::Zero, [&](Options* o, const std::string& argument) { symbolMap = true; }) + .add( + "--placeholdermap", + "", + "Write a file mapping placeholder indices to the function names.", + {Mode::Split}, + Options::Arguments::Zero, + [&](Options* o, const std::string& argument) { placeholderMap = true; }) .add("--import-namespace", "", "The namespace from which to import objects from the primary " @@ -690,6 +698,15 @@ void writeSymbolMap(Module& wasm, std::string filename) { runner.run(); } +void writePlaceholderMap(const std::map<size_t, Name> placeholderMap, + std::string filename) { + Output output(filename, Flags::Text); + auto& o = output.getStream(); + for (auto pair : placeholderMap) { + o << pair.first << ':' << pair.second << '\n'; + } +} + void splitModule(const WasmSplitOptions& options) { Module wasm; parseInput(wasm, options); @@ -795,8 +812,8 @@ void splitModule(const WasmSplitOptions& options) { config.newExportPrefix = options.exportPrefix; } config.minimizeNewExportNames = !options.passOptions.debugInfo; - std::unique_ptr<Module> secondary = - ModuleSplitting::splitFunctions(wasm, config); + auto splitResults = ModuleSplitting::splitFunctions(wasm, config); + auto& secondary = splitResults.secondary; adjustTableSize(wasm, options.initialTableSize); adjustTableSize(*secondary, options.initialTableSize); @@ -806,6 +823,11 @@ void splitModule(const WasmSplitOptions& options) { writeSymbolMap(*secondary, options.secondaryOutput + ".symbols"); } + if (options.placeholderMap) { + writePlaceholderMap(splitResults.placeholderMap, + options.primaryOutput + ".placeholders"); + } + // Set the names of the split modules. This can help differentiate them in // stack traces. if (options.emitModuleNames) { |