LinearExecutionWalker cleanups: call noteNonLinear for only necessary blocks, as some do not have branches, and add a missing call for unreachable which just like return halts control flow

1 files changed, 8 insertions, 1 deletions

diff --git a/src/wasm-traversal.h b/src/wasm-traversal.h
index 47b9d26e8..620ff0161 100644
--- a/src/wasm-traversal.h
+++ b/src/wasm-traversal.h
@@ -581,7 +581,9 @@ struct LinearExecutionWalker : public PostWalker<SubType, VisitorType> {
       case Expression::Id::InvalidId: abort();
       case Expression::Id::BlockId: {
         self->pushTask(SubType::doVisitBlock, currp);
-        self->pushTask(SubType::doNoteNonLinear, currp);
+        if (curr->cast<Block>()->name.is()) {
+          self->pushTask(SubType::doNoteNonLinear, currp);
+        }
         auto& list = curr->cast<Block>()->list;
         for (int i = int(list.size()) - 1; i >= 0; i--) {
           self->pushTask(SubType::scan, &list[i]);
@@ -624,6 +626,11 @@ struct LinearExecutionWalker : public PostWalker<SubType, VisitorType> {
         self->maybePushTask(SubType::scan, &curr->cast<Return>()->value);
         break;
       }
+      case Expression::Id::UnreachableId: {
+        self->pushTask(SubType::doVisitUnreachable, currp);
+        self->pushTask(SubType::doNoteNonLinear, currp);
+        break;
+      }
       default: {
         // other node types do not have control flow, use regular post-order
         PostWalker<SubType, VisitorType>::scan(self, currp);