1 files changed, 9 insertions, 0 deletions
diff --git a/src/ast_utils.h b/src/ast_utils.h
index 95f725636..dfa233f26 100644
--- a/src/ast_utils.h
+++ b/src/ast_utils.h
@@ -176,6 +176,15 @@ struct ReFinalize : public WalkerPass<PostWalker<ReFinalize>> {
   void visitNop(Nop *curr) { curr->finalize(); }
   void visitUnreachable(Unreachable *curr) { curr->finalize(); }
 
+  void visitFunction(Function* curr) {
+    // we may have changed the body from unreachable to none, which might be bad
+    // if the function has a return value
+    if (curr->result != none && curr->body->type == none) {
+      Builder builder(*getModule());
+      curr->body = builder.blockify(curr->body, builder.makeUnreachable());
+    }
+  }
+
   WasmType getValueType(Expression* value) {
     return value ? value->type : none;
   }