better

Author: kripken

src/passes/Inlining.cpp

@@ -198,6 +198,8 @@ struct FunctionInfoScanner
   : public WalkerPass<PostWalker<FunctionInfoScanner>> {
   bool isFunctionParallel() override { return true; }
 
+  bool modifiesBinaryenIR() override { return false; }
+
   FunctionInfoScanner(NameInfoMap& infos) : infos(infos) {}
 
   std::unique_ptr<Pass> create() override {
@@ -323,6 +325,8 @@ struct InliningState {
 struct Planner : public WalkerPass<TryDepthWalker<Planner>> {
   bool isFunctionParallel() override { return true; }
 
+  bool modifiesBinaryenIR() override { return false; }
+
   Planner(InliningState* state) : state(state) {}
 
   std::unique_ptr<Pass> create() override {
@@ -688,6 +692,10 @@ static void updateAfterInlining(Module* module, Function* into) {
   // Inlining unreachable contents can make things in the function we inlined
   // into unreachable.
   ReFinalize().walkFunctionInModule(into, module);
+  // New locals we added may require fixups for nondefaultability. We do this
+  // here and not in the main pass (or its subpasses) so that we only do it
+  // where needed.
+  TypeUpdating::handleNonDefaultableLocals(into, *module);
 }
 
 static void doInlining(Module* module,
@@ -707,6 +715,9 @@ using ChosenActions = std::unordered_map<Name, std::vector<InliningAction>>;
 struct DoInlining : public Pass {
   bool isFunctionParallel() override { return true; }
 
+  // We do this only where we inline, inside updateAfterInlining().
+  bool requiresNonNullableLocalFixups() override { return false; }
+
   std::unique_ptr<Pass> create() override {
     return std::make_unique<DoInlining>(chosenActions);
   }