wip

Author: stevenfontanella

src/ir/child-typer.h

@@ -1361,8 +1361,13 @@ template<typename Subtype> struct ChildTyper : OverriddenVisitor<Subtype> {
   void visitStructWait(StructWait* curr,
                        std::optional<HeapType> ht = std::nullopt) {
     if (!ht) {
+      if (!curr->structType.isStruct()) {
+        self().noteUnknown();
+        return;
+      }
       ht = curr->structType;
     }
+
     note(&curr->ref, Type(*ht, Nullable));
     note(&curr->expected, Type(Type::BasicType::i32));
     note(&curr->timeout, Type(Type::BasicType::i64));

src/ir/effects.h

@@ -1165,13 +1165,19 @@ class EffectAnalyzer {
       parent.mayNotReturn = true;
       parent.implicitTrap = true;
 
-      // if (curr->)
+      if (curr->ref->type == Type::unreachable) {
+        return;
+      }
 
-      // field must exist and be a packed waitqueue if this is valid Wasm.
-      if (curr->structType.isStruct() &&
-          curr->index < curr->structType.getStruct().fields.size() &&
-          curr->structType.getStruct().fields.at(curr->index).mutable_ ==
-            Mutable) {
+      // If the ref isn't `unreachable`, then the field must exist and be a
+      // packed waitqueue due to validation.
+      if (curr->ref->type.isStruct() &&
+          curr->index <
+            curr->ref->type.getHeapType().getStruct().fields.size() &&
+          curr->ref->type.getHeapType()
+              .getStruct()
+              .fields.at(curr->index)
+              .mutable_ == Mutable) {
         parent.readsMutableStruct = true;
       }
     }