1 files changed, 11 insertions, 0 deletions
diff --git a/src/passes/SSAify.cpp b/src/passes/SSAify.cpp
index fb952933e..547b9cb53 100644
--- a/src/passes/SSAify.cpp
+++ b/src/passes/SSAify.cpp
@@ -53,6 +53,7 @@
 #include "ir/find_all.h"
 #include "ir/literal-utils.h"
 #include "ir/local-graph.h"
+#include "ir/utils.h"
 #include "pass.h"
 #include "support/permutations.h"
 #include "wasm-builder.h"
@@ -85,6 +86,7 @@ struct SSAify : public Pass {
   Function* func;
   // things we add to the function prologue
   std::vector<Expression*> functionPrepends;
+  bool refinalize = false;
 
   void runOnFunction(Module* module_, Function* func_) override {
     module = module_;
@@ -99,6 +101,10 @@ struct SSAify : public Pass {
     computeGetsAndPhis(graph);
     // add prepends to function
     addPrepends();
+
+    if (refinalize) {
+      ReFinalize().walkFunctionInModule(func, module);
+    }
   }
 
   void createNewIndexes(LocalGraph& graph) {
@@ -142,6 +148,11 @@ struct SSAify : public Pass {
             // zero it out
             (*graph.locations[get]) =
               LiteralUtils::makeZero(get->type, *module);
+            // If we replace a local.get with a null then we are refining the
+            // type that the parent receives to a bottom type.
+            if (get->type.isRef()) {
+              refinalize = true;
+            }
           } else {
             // No zero exists here, so this is a nondefaultable type. The
             // default won't be used anyhow, so this value does not really