diff options
| -rw-r--r-- | src/passes/PrintFunctionMap.cpp | 8 | ||||
| -rw-r--r-- | src/passes/pass.cpp | 9 | ||||
| -rw-r--r-- | src/support/file.cpp | 11 | ||||
| -rw-r--r-- | src/support/file.h | 2 | ||||
| -rw-r--r-- | test/unit/test_symbolmap.py | 20 |
5 files changed, 42 insertions, 8 deletions
diff --git a/src/passes/PrintFunctionMap.cpp b/src/passes/PrintFunctionMap.cpp index 75db495fa..c2be0f3a2 100644 --- a/src/passes/PrintFunctionMap.cpp +++ b/src/passes/PrintFunctionMap.cpp @@ -25,6 +25,7 @@ // #include "pass.h" +#include "support/file.h" #include "wasm.h" namespace wasm { @@ -33,9 +34,14 @@ struct PrintFunctionMap : public Pass { bool modifiesBinaryenIR() override { return false; } void run(PassRunner* runner, Module* module) override { + // If an argument is provided, write to that file; otherwise write to + // stdout. + auto outFile = runner->options.getArgumentOrDefault("symbolmap", ""); + Output output(outFile, Flags::Text); + auto& o = output.getStream(); Index i = 0; for (auto& func : module->functions) { - std::cout << i++ << ':' << func->name.str << '\n'; + o << i++ << ':' << func->name.str << '\n'; } } }; diff --git a/src/passes/pass.cpp b/src/passes/pass.cpp index 0d9bd62e5..260bc761b 100644 --- a/src/passes/pass.cpp +++ b/src/passes/pass.cpp @@ -262,9 +262,18 @@ void PassRegistry::registerPasses() { "print-full", "print in full s-expression format", createFullPrinterPass); registerPass( "print-call-graph", "print call graph", createPrintCallGraphPass); + + // Register PrintFunctionMap using its normal name. registerPass("print-function-map", "print a map of function indexes to names", createPrintFunctionMapPass); + // Also register it as "symbolmap" so that wasm-opt --symbolmap=foo is the + // same as wasm-as --symbolmap=foo even though the latter is not a pass + // (wasm-as cannot run arbitrary passes). + // TODO: switch emscripten to this name, then remove the old one + registerPass( + "symbolmap", "(alias for print-function-map)", createPrintFunctionMapPass); + registerPass("print-stack-ir", "print out Stack IR (useful for internal debugging)", createPrintStackIRPass); diff --git a/src/support/file.cpp b/src/support/file.cpp index 2a8426461..d17e3a338 100644 --- a/src/support/file.cpp +++ b/src/support/file.cpp @@ -88,11 +88,12 @@ template std::vector<char> wasm::read_file<>(const std::string&, wasm::Output::Output(const std::string& filename, Flags::BinaryOption binary) : outfile(), out([this, filename, binary]() { - if (filename == "-") { - return std::cout.rdbuf(); - } + // Ensure a single return at the very end, to avoid clang-tidy warnings + // about the types of different returns here. std::streambuf* buffer; - if (filename.size()) { + if (filename == "-" || filename.empty()) { + buffer = std::cout.rdbuf(); + } else { BYN_TRACE("Opening '" << filename << "'\n"); auto flags = std::ofstream::out | std::ofstream::trunc; if (binary == Flags::Binary) { @@ -104,8 +105,6 @@ wasm::Output::Output(const std::string& filename, Flags::BinaryOption binary) exit(EXIT_FAILURE); } buffer = outfile.rdbuf(); - } else { - buffer = std::cout.rdbuf(); } return buffer; }()) {} diff --git a/src/support/file.h b/src/support/file.h index 3dc766b2d..ae91831c9 100644 --- a/src/support/file.h +++ b/src/support/file.h @@ -50,7 +50,7 @@ std::string read_possible_response_file(const std::string&); class Output { public: - // An empty filename will open stdout instead. + // An empty filename or "-" will open stdout instead. Output(const std::string& filename, Flags::BinaryOption binary); ~Output() = default; template<typename T> std::ostream& operator<<(const T& v) { return out << v; } diff --git a/test/unit/test_symbolmap.py b/test/unit/test_symbolmap.py new file mode 100644 index 000000000..59ce1847e --- /dev/null +++ b/test/unit/test_symbolmap.py @@ -0,0 +1,20 @@ +from scripts.test import shared +from . import utils + + +class SymbolMapTest(utils.BinaryenTestCase): + def test_symbolmap(self): + input_wasm = self.input_path('hello_world.wat') + # write the symbol map to a file + args = [input_wasm, '--symbolmap=out.symbols'] + shared.run_process(shared.WASM_OPT + args) + with open('out.symbols') as f: + file_output = f.read() + # write the symbol map to stdout + args = [input_wasm, '--symbolmap'] + stdout_output = shared.run_process(shared.WASM_OPT + args, + capture_output=True).stdout + # ignore whitespace in the comparison as on windows stdout gets an \r + self.assertEqual(file_output.strip(), stdout_output.strip()) + # the wat contains a single function "add" + self.assertIn('0:add', file_output) |