Remove --print-symbol-map / --symbolmap=

This is no longer needed by emscripten.  See
emscripten-core/emscripten#25053.

Author: sbc100

src/passes/CMakeLists.txt

@@ -91,7 +91,6 @@ set(passes_SOURCES
   Print.cpp
   PrintCallGraph.cpp
   PrintFeatures.cpp
-  PrintFunctionMap.cpp
   RoundTrip.cpp
   SetGlobals.cpp
   SignaturePruning.cpp

src/passes/PrintFunctionMap.cpp

@@ -398,17 +398,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);

src/passes/pass.cpp

@@ -131,7 +131,6 @@ Pass* createPrecomputePropagatePass();
 Pass* createPrinterPass();
 Pass* createPrintCallGraphPass();
 Pass* createPrintFeaturesPass();
-Pass* createPrintFunctionMapPass();
 Pass* createPropagateGlobalsGloballyPass();
 Pass* createRandomizeBranchHintsPass();
 Pass* createRemoveNonJSOpsPass();

src/passes/passes.h

@@ -440,7 +440,7 @@ For more on how to optimize effectively, see
         options.passes.begin(),
         options.passes.end(),
         [](const OptimizationOptions::PassInfo& info) {
-          return info.name == "print" || info.name == "print-function-map";
+          return info.name == "print";
         });
       if (!printsToStdout) {
         std::cerr << "warning: no output file specified, not emitting output\n";

src/tools/wasm-opt.cpp

@@ -374,9 +374,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:
@@ -526,8 +523,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

test/lit/help/wasm-metadce.test

@@ -398,9 +398,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:
@@ -550,8 +547,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

test/lit/help/wasm-opt.test

@@ -338,9 +338,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:
@@ -490,8 +487,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

test/lit/help/wasm2js.test

@@ -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)