Fix validation of resource methods in instance types (#1072)

This commit fixes an issue in `wasmparser`'s validation of component
instance types where `[method]foo.bar`-style name mangling was
erroneously considered invalid. This happened because registration of
which names were valid to use only happened for components and component
types, not for instance types. This is because the location that
registered names of resources also did other validation which isn't
required for instance types as that validation is deferred to later.

This commit addresses the issue by moving the logic to register the
names of resources above the short-circuit that skips the rest of the
validation logic in the function.

crates/wasmparser/src/validator/component.rs

@@ -555,6 +555,21 @@ impl ComponentState {
         ty: &ComponentEntityType,
         types: &TypeAlloc,
     ) -> bool {
+        if let ComponentEntityType::Type { created, .. } = ty {
+            // If this is a top-level resource then register it in the
+            // appropriate context so later validation of method-like-names
+            // works out.
+            if let Some(name) = toplevel_name {
+                if let Type::Resource(_) = types[*created] {
+                    let cx = match kind {
+                        ExternKind::Import => &mut self.toplevel_imported_resources,
+                        ExternKind::Export => &mut self.toplevel_exported_resources,
+                    };
+                    cx.register(name, *created);
+                }
+            }
+        }
+
         match self.kind {
             ComponentKind::Component | ComponentKind::ComponentType => {}
             ComponentKind::InstanceType => return true,
@@ -589,19 +604,6 @@ impl ComponentState {
                     }
                 }
 
-                // If this is a top-level resource then register it in the
-                // appropriate context so later validation of method-like-names
-                // works out.
-                if let Some(name) = toplevel_name {
-                    if let Type::Resource(_) = types[*created] {
-                        let cx = match kind {
-                            ExternKind::Import => &mut self.toplevel_imported_resources,
-                            ExternKind::Export => &mut self.toplevel_exported_resources,
-                        };
-                        cx.register(name, *created);
-                    }
-                }
-
                 true
             }
 

tests/local/component-model/resources.wast

@@ -1127,3 +1127,13 @@
     (export "t2" (instance (type $t2')))
   ))
 )
+
+(component
+  (type (component
+    (type (instance
+      (export "bar" (type (sub resource)))
+      (export "[static]bar.a" (func))
+    ))
+    (export "x" (instance (type 0)))
+  ))
+)

tests/snapshots/local/component-model/resources.wast/110.print

@@ -0,0 +1,14 @@
+(component
+  (type (;0;)
+    (component
+      (type (;0;)
+        (instance
+          (export (;0;) "bar" (type (sub resource)))
+          (type (;1;) (func))
+          (export (;0;) "[static]bar.a" (func (type 1)))
+        )
+      )
+      (export (;0;) "x" (instance (type 0)))
+    )
+  )
+)