Merge pull request #493 from WebAssembly/error-improvements

Error handling improvements

1 files changed, 5 insertions, 1 deletions

diff --git a/src/wasm.cpp b/src/wasm.cpp
index 2157992e3..98268310a 100644
--- a/src/wasm.cpp
+++ b/src/wasm.cpp
@@ -33,7 +33,11 @@ struct BlockTypeSeeker : public PostWalker<BlockTypeSeeker, Visitor<BlockTypeSee
       if (other == none) {
         type = none;
       } else if (other != unreachable) {
-        type = other;
+        if (type == unreachable) {
+          type = other;
+        } else if (type != other) {
+          type = none; // poison value, we saw multiple types; this should not be consumed
+        }
       }
     }
   }