Remove --print-symbol-map / --symbolmap (#7862)

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

Author: sbc100

CHANGELOG.md

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

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

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

src/passes/pass.cpp

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

src/passes/passes.h

@@ -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";
       }

src/tools/wasm-opt.cpp

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

test/lit/help/wasm-metadce.test

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

test/lit/help/wasm-opt.test

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