Add initialization functions for passes to avoid missing pass registration due to linker dead code elimination. Fixes WebAssembly#577.

juj · kripken · commit 41689a5dde63 · 2016-06-21T16:44:14.000-07:00
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -38,6 +38,8 @@ FOREACH(SUFFIX "_DEBUG" "_RELEASE" "_RELWITHDEBINFO" "_MINSIZEREL" "")
   SET(CMAKE_ARCHIVE_OUTPUT_DIRECTORY${SUFFIX} "${PROJECT_BINARY_DIR}/lib")
 ENDFOREACH()
 
+SET(all_passes passes)
+
 IF(MSVC)
   IF(CMAKE_CXX_COMPILER_VERSION VERSION_LESS "19.0") # VS2013 and older explicitly need /arch:sse2 set, VS2015 no longer has that option, but always enabled. 
     ADD_COMPILE_FLAG("/arch:sse2")
@@ -51,7 +53,6 @@ IF(MSVC)
   ENDIF()
   ADD_COMPILE_FLAG("-D_CRT_SECURE_NO_WARNINGS")
   ADD_COMPILE_FLAG("-D_SCL_SECURE_NO_WARNINGS")
-  SET(all_passes passes)
 ELSE()
   SET(THREADS_PREFER_PTHREAD_FLAG ON)
   SET(CMAKE_THREAD_PREFER_PTHREAD ON)
@@ -72,11 +73,6 @@ ELSE()
     ADD_COMPILE_FLAG("-O2")
     ADD_DEFINITIONS("-UNDEBUG")  # Keep asserts.
   ENDIF()
-  if (CMAKE_SYSTEM_NAME STREQUAL "Darwin")
-    SET(all_passes "-force_load" passes)
-  ELSE()
-    SET(all_passes "-Wl,--whole-archive" passes "-Wl,-no-whole-archive")
-  ENDIF()
 ENDIF()
 
 # clang doesn't print colored diagnostics when invoked from Ninja
diff --git a/src/asm2wasm.h b/src/asm2wasm.h
@@ -27,6 +27,7 @@
 #include "mixed_arena.h"
 #include "asmjs/shared-constants.h"
 #include "asm_v_wasm.h"
+#include "passes/passes.h"
 #include "pass.h"
 #include "ast_utils.h"
 #include "wasm-builder.h"
diff --git a/src/pass.h b/src/pass.h
@@ -32,6 +32,8 @@ class Pass;
 // Global registry of all passes in /passes/
 //
 struct PassRegistry {
+  PassRegistry();
+
   static PassRegistry* get();
 
   typedef std::function<Pass* ()> Creator;
@@ -42,6 +44,8 @@ struct PassRegistry {
   std::string getPassDescription(std::string name);
 
 private:
+  void registerPasses();
+
   struct PassInfo {
     std::string description;
     Creator create;
@@ -51,18 +55,6 @@ struct PassRegistry {
   std::map<std::string, PassInfo> passInfos;
 };
 
-//
-// Utility class to register a pass. See pass files for usage.
-//
-template<class P>
-struct RegisterPass {
-  RegisterPass(const char* name, const char *description) {
-    PassRegistry::get()->registerPass(name, description, []() {
-      return new P();
-    });
-  }
-};
-
 //
 // Runs a set of passes, in order
 //
diff --git a/src/passes/CoalesceLocals.cpp b/src/passes/CoalesceLocals.cpp
@@ -595,8 +595,12 @@ void CoalesceLocalsWithLearning::pickIndices(std::vector<Index>& indices) {
 
 // declare passes
 
-static RegisterPass<CoalesceLocals> registerPass1("coalesce-locals", "reduce # of locals by coalescing");
+Pass *createCoalesceLocalsPass() {
+  return new CoalesceLocals();
+}
 
-static RegisterPass<CoalesceLocalsWithLearning> registerPass2("coalesce-locals-learning", "reduce # of locals by coalescing and learning");
+Pass *createCoalesceLocalsWithLearningPass() {
+  return new CoalesceLocalsWithLearning();
+}
 
 } // namespace wasm
diff --git a/src/passes/DeadCodeElimination.cpp b/src/passes/DeadCodeElimination.cpp
@@ -346,7 +346,9 @@ struct DeadCodeElimination : public WalkerPass<PostWalker<DeadCodeElimination, V
   }
 };
 
-static RegisterPass<DeadCodeElimination> registerPass("dce", "removes unreachable code");
+Pass *createDeadCodeEliminationPass() {
+  return new DeadCodeElimination();
+}
 
 } // namespace wasm
 
diff --git a/src/passes/DropReturnValues.cpp b/src/passes/DropReturnValues.cpp
@@ -75,7 +75,9 @@ struct DropReturnValues : public WalkerPass<PostWalker<DropReturnValues, Visitor
   }
 };
 
-static RegisterPass<DropReturnValues> registerPass("drop-return-values", "stops relying on return values from set_local and store");
+Pass *createDropReturnValuesPass() {
+  return new DropReturnValues();
+}
 
 } // namespace wasm
 
diff --git a/src/passes/DuplicateFunctionElimination.cpp b/src/passes/DuplicateFunctionElimination.cpp
@@ -164,7 +164,9 @@ struct DuplicateFunctionElimination : public Pass {
   }
 };
 
-static RegisterPass<DuplicateFunctionElimination> registerPass("duplicate-function-elimination", "removes duplicate functions");
+Pass *createDuplicateFunctionEliminationPass() {
+  return new DuplicateFunctionElimination();
+}
 
 } // namespace wasm
 
diff --git a/src/passes/LowerIfElse.cpp b/src/passes/LowerIfElse.cpp
@@ -60,6 +60,8 @@ struct LowerIfElse : public WalkerPass<PostWalker<LowerIfElse, Visitor<LowerIfEl
   }
 };
 
-static RegisterPass<LowerIfElse> registerPass("lower-if-else", "lowers if-elses into ifs, blocks and branches");
+Pass *createLowerIfElsePass() {
+  return new LowerIfElse();
+}
 
 } // namespace wasm
diff --git a/src/passes/LowerInt64.cpp b/src/passes/LowerInt64.cpp
@@ -189,6 +189,8 @@ struct LowerInt64 : public Pass {
   }
 };
 
-static RegisterPass<LowerInt64> registerPass("lower-i64", "lowers i64 into pairs of i32s");
+Pass *createLowerInt64Pass() {
+  return new LowerInt64();
+}
 
 } // namespace wasm
diff --git a/src/passes/MergeBlocks.cpp b/src/passes/MergeBlocks.cpp
@@ -178,7 +178,9 @@ struct MergeBlocks : public WalkerPass<PostWalker<MergeBlocks, Visitor<MergeBloc
   }
 };
 
-static RegisterPass<MergeBlocks> registerPass("merge-blocks", "merges blocks to their parents");
+Pass *createMergeBlocksPass() {
+  return new MergeBlocks();
+}
 
 } // namespace wasm
 
diff --git a/src/passes/Metrics.cpp b/src/passes/Metrics.cpp
@@ -87,7 +87,10 @@ struct Metrics : public WalkerPass<PostWalker<Metrics, UnifiedExpressionVisitor<
   }
 };
 
+Pass *createMetricsPass() {
+  return new Metrics();
+}
+
 Metrics *Metrics::lastMetricsPass;
-static RegisterPass<Metrics> registerPass("metrics", "reports metrics");
 
 } // namespace wasm
diff --git a/src/passes/NameList.cpp b/src/passes/NameList.cpp
@@ -32,7 +32,9 @@ struct NameList : public Pass {
   }
 };
 
-static RegisterPass<NameList> registerPass("nm", "name list");
+Pass *createNameListPass() {
+  return new NameList();
+}
 
 } // namespace wasm
 
diff --git a/src/passes/NameManager.cpp b/src/passes/NameManager.cpp
@@ -74,6 +74,8 @@ void NameManager::visitExport(Export* curr) {
   names.insert(curr->name);
 }
 
-static RegisterPass<NameManager> registerPass("name-manager", "utility pass to manage names in modules");
+Pass *createNameManagerPass() {
+  return new NameManager();
+}
 
 } // namespace wasm
diff --git a/src/passes/OptimizeInstructions.cpp b/src/passes/OptimizeInstructions.cpp
@@ -86,6 +86,8 @@ struct OptimizeInstructions : public WalkerPass<PostWalker<OptimizeInstructions,
   }
 };
 
-static RegisterPass<OptimizeInstructions> registerPass("optimize-instructions", "optimizes instruction combinations");
+Pass *createOptimizeInstructionsPass() {
+  return new OptimizeInstructions();
+}
 
 } // namespace wasm
diff --git a/src/passes/PostEmscripten.cpp b/src/passes/PostEmscripten.cpp
@@ -77,6 +77,8 @@ struct PostEmscripten : public WalkerPass<PostWalker<PostEmscripten, Visitor<Pos
   }
 };
 
-static RegisterPass<PostEmscripten> registerPass("post-emscripten", "miscellaneous optimizations for Emscripten-generated code");
+Pass *createPostEmscriptenPass() {
+  return new PostEmscripten();
+}
 
 } // namespace wasm
diff --git a/src/passes/Precompute.cpp b/src/passes/Precompute.cpp
@@ -97,7 +97,9 @@ struct Precompute : public WalkerPass<PostWalker<Precompute, UnifiedExpressionVi
   }
 };
 
-static RegisterPass<Precompute> registerPass("precompute", "computes compile-time evaluatable expressions");
+Pass *createPrecomputePass() {
+  return new Precompute();
+}
 
 } // namespace wasm
 
diff --git a/src/passes/Print.cpp b/src/passes/Print.cpp
@@ -623,7 +623,9 @@ void Printer::run(PassRunner* runner, Module* module) {
   print.visitModule(module);
 }
 
-static RegisterPass<Printer> registerPass("print", "print in s-expression format");
+Pass *createPrinterPass() {
+  return new Printer();
+}
 
 // Prints out a minified module
 
@@ -639,7 +641,9 @@ class MinifiedPrinter : public Printer {
   }
 };
 
-static RegisterPass<MinifiedPrinter> registerMinifyPass("print-minified", "print in minified s-expression format");
+Pass *createMinifiedPrinterPass() {
+  return new MinifiedPrinter();
+}
 
 // Prints out a module withough elision, i.e., the full ast
 
@@ -655,7 +659,9 @@ class FullPrinter : public Printer {
   }
 };
 
-static RegisterPass<FullPrinter> registerFullASTPass("print-full", "print in full s-expression format");
+Pass *createFullPrinterPass() {
+  return new FullPrinter();
+}
 
 // Print individual expressions
 
diff --git a/src/passes/RemoveImports.cpp b/src/passes/RemoveImports.cpp
@@ -58,6 +58,8 @@ struct RemoveImports : public WalkerPass<PostWalker<RemoveImports, Visitor<Remov
   }
 };
 
-static RegisterPass<RemoveImports> registerPass("remove-imports", "removes imports and replaces them with nops");
+Pass *createRemoveImportsPass() {
+  return new RemoveImports();
+}
 
 } // namespace wasm
diff --git a/src/passes/RemoveMemory.cpp b/src/passes/RemoveMemory.cpp
@@ -29,6 +29,8 @@ struct RemoveMemory : public Pass {
   }
 };
 
-static RegisterPass<RemoveMemory> registerPass("remove-memory", "removes memory segments");
+Pass *createRemoveMemoryPass() {
+  return new RemoveMemory();
+}
 
 } // namespace wasm
diff --git a/src/passes/RemoveUnusedBrs.cpp b/src/passes/RemoveUnusedBrs.cpp
@@ -232,6 +232,8 @@ struct RemoveUnusedBrs : public WalkerPass<PostWalker<RemoveUnusedBrs, Visitor<R
   }
 };
 
-static RegisterPass<RemoveUnusedBrs> registerPass("remove-unused-brs", "removes breaks from locations that are not needed");
+Pass *createRemoveUnusedBrsPass() {
+  return new RemoveUnusedBrs();
+}
 
 } // namespace wasm
diff --git a/src/passes/RemoveUnusedFunctions.cpp b/src/passes/RemoveUnusedFunctions.cpp
@@ -54,6 +54,8 @@ struct RemoveUnusedFunctions : public Pass {
   }
 };
 
-static RegisterPass<RemoveUnusedFunctions> registerPass("remove-unused-functions", "removes unused functions");
+Pass *createRemoveUnusedFunctionsPass() {
+  return new RemoveUnusedFunctions();
+}
 
 } // namespace wasm
diff --git a/src/passes/RemoveUnusedNames.cpp b/src/passes/RemoveUnusedNames.cpp
@@ -54,6 +54,8 @@ struct RemoveUnusedNames : public WalkerPass<PostWalker<RemoveUnusedNames, Visit
   }
 };
 
-static RegisterPass<RemoveUnusedNames> registerPass("remove-unused-names", "removes names from locations that are never branched to");
+Pass *createRemoveUnusedNamesPass() {
+  return new RemoveUnusedNames();
+}
 
 } // namespace wasm
diff --git a/src/passes/ReorderFunctions.cpp b/src/passes/ReorderFunctions.cpp
@@ -57,6 +57,8 @@ struct ReorderFunctions : public WalkerPass<PostWalker<ReorderFunctions, Visitor
   }
 };
 
-static RegisterPass<ReorderFunctions> registerPass("reorder-functions", "sorts functions by access frequency");
+Pass *createReorderFunctionsPass() {
+  return new ReorderFunctions();
+}
 
 } // namespace wasm
diff --git a/src/passes/ReorderLocals.cpp b/src/passes/ReorderLocals.cpp
@@ -134,6 +134,8 @@ struct ReorderLocals : public WalkerPass<PostWalker<ReorderLocals, Visitor<Reord
   }
 };
 
-static RegisterPass<ReorderLocals> registerPass("reorder-locals", "sorts locals by access frequency");
+Pass *createReorderLocalsPass() {
+  return new ReorderLocals();
+}
 
 } // namespace wasm
diff --git a/src/passes/SimplifyLocals.cpp b/src/passes/SimplifyLocals.cpp
@@ -434,6 +434,8 @@ struct SimplifyLocals : public WalkerPass<LinearExecutionWalker<SimplifyLocals,
   }
 };
 
-static RegisterPass<SimplifyLocals> registerPass("simplify-locals", "miscellaneous locals-related optimizations");
+Pass *createSimplifyLocalsPass() {
+  return new SimplifyLocals();
+}
 
 } // namespace wasm
diff --git a/src/passes/Vacuum.cpp b/src/passes/Vacuum.cpp
@@ -228,7 +228,9 @@ struct Vacuum : public WalkerPass<PostWalker<Vacuum, Visitor<Vacuum>>> {
   }
 };
 
-static RegisterPass<Vacuum> registerPass("vacuum", "removes obviously unneeded code");
+Pass *createVacuumPass() {
+  return new Vacuum();
+}
 
 } // namespace wasm
 
diff --git a/src/passes/pass.cpp b/src/passes/pass.cpp
diff --git a/src/passes/passes.h b/src/passes/passes.h

Original file line number	Diff line number	Diff line change
`@@ -346,7 +346,9 @@ struct DeadCodeElimination : public WalkerPass<PostWalker<DeadCodeElimination, V`
`346`	`346`	`}`
`347`	`347`	`};`
`348`	`348`
`349`		`-static RegisterPass<DeadCodeElimination> registerPass("dce", "removes unreachable code");`
	`349`	`+Pass *createDeadCodeEliminationPass() {`
	`350`	`+ return new DeadCodeElimination();`
	`351`	`+}`
`350`	`352`
`351`	`353`	`} // namespace wasm`
`352`	`354`
Original file line number	Diff line number	Diff line change
`@@ -75,7 +75,9 @@ struct DropReturnValues : public WalkerPass<PostWalker<DropReturnValues, Visitor`
`75`	`75`	`}`
`76`	`76`	`};`
`77`	`77`
`78`		`-static RegisterPass<DropReturnValues> registerPass("drop-return-values", "stops relying on return values from set_local and store");`
	`78`	`+Pass *createDropReturnValuesPass() {`
	`79`	`+ return new DropReturnValues();`
	`80`	`+}`
`79`	`81`
`80`	`82`	`} // namespace wasm`
`81`	`83`
Original file line number	Diff line number	Diff line change
`@@ -164,7 +164,9 @@ struct DuplicateFunctionElimination : public Pass {`
`164`	`164`	`}`
`165`	`165`	`};`
`166`	`166`
`167`		`-static RegisterPass<DuplicateFunctionElimination> registerPass("duplicate-function-elimination", "removes duplicate functions");`
	`167`	`+Pass *createDuplicateFunctionEliminationPass() {`
	`168`	`+ return new DuplicateFunctionElimination();`
	`169`	`+}`
`168`	`170`
`169`	`171`	`} // namespace wasm`
`170`	`172`
Original file line number	Diff line number	Diff line change
`@@ -60,6 +60,8 @@ struct LowerIfElse : public WalkerPass<PostWalker<LowerIfElse, Visitor<LowerIfEl`
`60`	`60`	`}`
`61`	`61`	`};`
`62`	`62`
`63`		`-static RegisterPass<LowerIfElse> registerPass("lower-if-else", "lowers if-elses into ifs, blocks and branches");`
	`63`	`+Pass *createLowerIfElsePass() {`
	`64`	`+ return new LowerIfElse();`
	`65`	`+}`
`64`	`66`
`65`	`67`	`} // namespace wasm`
Original file line number	Diff line number	Diff line change
`@@ -189,6 +189,8 @@ struct LowerInt64 : public Pass {`
`189`	`189`	`}`
`190`	`190`	`};`
`191`	`191`
`192`		`-static RegisterPass<LowerInt64> registerPass("lower-i64", "lowers i64 into pairs of i32s");`
	`192`	`+Pass *createLowerInt64Pass() {`
	`193`	`+ return new LowerInt64();`
	`194`	`+}`
`193`	`195`
`194`	`196`	`} // namespace wasm`
Original file line number	Diff line number	Diff line change
`@@ -178,7 +178,9 @@ struct MergeBlocks : public WalkerPass<PostWalker<MergeBlocks, Visitor<MergeBloc`
`178`	`178`	`}`
`179`	`179`	`};`
`180`	`180`
`181`		`-static RegisterPass<MergeBlocks> registerPass("merge-blocks", "merges blocks to their parents");`
	`181`	`+Pass *createMergeBlocksPass() {`
	`182`	`+ return new MergeBlocks();`
	`183`	`+}`
`182`	`184`
`183`	`185`	`} // namespace wasm`
`184`	`186`