Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,8 @@ Current Trunk
- The --mod-asyncify-never-unwind and --mod-asyncify-always-and-only-unwind
passed were deleted. They only existed to support the lazy code loading
support in emscripten that was removed. (#7893)
- The --print-symbol-map/--symbolmap flags we removed. They only existed to
support an emscripten feature which was re-implemented downstream. (#7862)

v124
----
Expand Down
1 change: 0 additions & 1 deletion src/passes/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,6 @@ set(passes_SOURCES
Print.cpp
PrintCallGraph.cpp
PrintFeatures.cpp
PrintFunctionMap.cpp
RoundTrip.cpp
SetGlobals.cpp
SignaturePruning.cpp
Expand Down
54 changes: 0 additions & 54 deletions src/passes/PrintFunctionMap.cpp

This file was deleted.

11 changes: 0 additions & 11 deletions src/passes/pass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -391,17 +391,6 @@ void PassRegistry::registerPasses() {
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("propagate-globals-globally",
"propagate global values to other globals (useful for tests)",
createPropagateGlobalsGloballyPass);
Expand Down
1 change: 0 additions & 1 deletion src/passes/passes.h
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,6 @@ Pass* createPrecomputePropagatePass();
Pass* createPrinterPass();
Pass* createPrintCallGraphPass();
Pass* createPrintFeaturesPass();
Pass* createPrintFunctionMapPass();
Pass* createPropagateGlobalsGloballyPass();
Pass* createRandomizeBranchHintsPass();
Pass* createRemoveNonJSOpsPass();
Expand Down
12 changes: 6 additions & 6 deletions src/tools/wasm-opt.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -436,12 +436,12 @@ For more on how to optimize effectively, see

if (options.extra.count("output") == 0) {
if (!options.quiet) {
bool printsToStdout = std::any_of(
options.passes.begin(),
options.passes.end(),
[](const OptimizationOptions::PassInfo& info) {
return info.name == "print" || info.name == "print-function-map";
});
bool printsToStdout =
std::any_of(options.passes.begin(),
options.passes.end(),
[](const OptimizationOptions::PassInfo& info) {
return info.name == "print";
});
if (!printsToStdout) {
std::cerr << "warning: no output file specified, not emitting output\n";
}
Expand Down
5 changes: 0 additions & 5 deletions test/lit/help/wasm-metadce.test
Original file line number Diff line number Diff line change
Expand Up @@ -367,9 +367,6 @@
;; CHECK-NEXT: --print-full print in full s-expression
;; CHECK-NEXT: format
;; CHECK-NEXT:
;; CHECK-NEXT: --print-function-map print a map of function indexes
;; CHECK-NEXT: to names
;; CHECK-NEXT:
;; CHECK-NEXT: --print-minified print in minified s-expression
;; CHECK-NEXT: format
;; CHECK-NEXT:
Expand Down Expand Up @@ -522,8 +519,6 @@
;; CHECK-NEXT: --stub-unsupported-js stub out unsupported JS
;; CHECK-NEXT: operations
;; CHECK-NEXT:
;; CHECK-NEXT: --symbolmap (alias for print-function-map)
;; CHECK-NEXT:
;; CHECK-NEXT: --table64-lowering alias for memory64-lowering
;; CHECK-NEXT:
;; CHECK-NEXT: --trace-calls instrument the build with code
Expand Down
5 changes: 0 additions & 5 deletions test/lit/help/wasm-opt.test
Original file line number Diff line number Diff line change
Expand Up @@ -391,9 +391,6 @@
;; CHECK-NEXT: --print-full print in full s-expression
;; CHECK-NEXT: format
;; CHECK-NEXT:
;; CHECK-NEXT: --print-function-map print a map of function indexes
;; CHECK-NEXT: to names
;; CHECK-NEXT:
;; CHECK-NEXT: --print-minified print in minified s-expression
;; CHECK-NEXT: format
;; CHECK-NEXT:
Expand Down Expand Up @@ -546,8 +543,6 @@
;; CHECK-NEXT: --stub-unsupported-js stub out unsupported JS
;; CHECK-NEXT: operations
;; CHECK-NEXT:
;; CHECK-NEXT: --symbolmap (alias for print-function-map)
;; CHECK-NEXT:
;; CHECK-NEXT: --table64-lowering alias for memory64-lowering
;; CHECK-NEXT:
;; CHECK-NEXT: --trace-calls instrument the build with code
Expand Down
5 changes: 0 additions & 5 deletions test/lit/help/wasm2js.test
Original file line number Diff line number Diff line change
Expand Up @@ -331,9 +331,6 @@
;; CHECK-NEXT: --print-full print in full s-expression
;; CHECK-NEXT: format
;; CHECK-NEXT:
;; CHECK-NEXT: --print-function-map print a map of function indexes
;; CHECK-NEXT: to names
;; CHECK-NEXT:
;; CHECK-NEXT: --print-minified print in minified s-expression
;; CHECK-NEXT: format
;; CHECK-NEXT:
Expand Down Expand Up @@ -486,8 +483,6 @@
;; CHECK-NEXT: --stub-unsupported-js stub out unsupported JS
;; CHECK-NEXT: operations
;; CHECK-NEXT:
;; CHECK-NEXT: --symbolmap (alias for print-function-map)
;; CHECK-NEXT:
;; CHECK-NEXT: --table64-lowering alias for memory64-lowering
;; CHECK-NEXT:
;; CHECK-NEXT: --trace-calls instrument the build with code
Expand Down
87 changes: 0 additions & 87 deletions test/lit/wasm-split/symbolmap-multi-split.wast

This file was deleted.

28 changes: 0 additions & 28 deletions test/lit/wasm-split/symbolmap.wast

This file was deleted.

11 changes: 0 additions & 11 deletions test/passes/print-function-map.txt

This file was deleted.

6 changes: 0 additions & 6 deletions test/passes/print-function-map.wast

This file was deleted.

20 changes: 0 additions & 20 deletions test/unit/test_symbolmap.py

This file was deleted.

4 changes: 0 additions & 4 deletions test/unit/test_warnings.py
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,3 @@ def test_quiet_suppresses_warnings(self):
def test_no_warn_on_print(self):
err = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wat'), '--print'], stderr=subprocess.PIPE).stderr
self.assertNotIn('warning: no output file specified, not emitting output', err)

def test_no_warn_on_print_function_map(self):
err = shared.run_process(shared.WASM_OPT + [self.input_path('asyncify-pure.wat'), '--print-function-map'], stderr=subprocess.PIPE).stderr
self.assertNotIn('warning: no output file specified, not emitting output', err)
Loading