Prepare some component-model tests for upstreaming (bytecodealliance#2335)

This commit prepares a number of the `component-model/*.wast` tests for
upstreaming into the component model repository itself. Namely:

* All `value`-related functionality is moved to `values.wast` instead of
  being spread out.
* All components are now either `component definition` or a nested
  component to work well in Wasmtime (previously everything assumed it
  could import anything).

Tests now pass with `wasmtime wast` and after this I plan on upstreaming
these tests to the component model repository itself.

Author: alexcrichton

tests/cli/component-model/a.wast

@@ -1,6 +1,6 @@
 ;; RUN: wast --assert default --snapshot tests/snapshots %
 
-(component
+(component definition
   (import "log" (func $log (param "msg" string)))
   (core module $libc
     (memory (export "memory") 1)

tests/cli/component-model/adapt.wast

@@ -1,23 +1,27 @@
-;; RUN: wast --assert default --snapshot tests/snapshots % -f cm-values
+;; RUN: wast --assert default --snapshot tests/snapshots %
 
 (component
-  (import "i" (instance $i
-    (export "f1" (func))
-    (export "f2" (func (param "p1" string)))
-  ))
-  (export "run" (func $i "f1"))
+  (component
+    (import "i" (instance $i
+      (export "f1" (func))
+      (export "f2" (func (param "p1" string)))
+    ))
+    (export "run" (func $i "f1"))
+  )
 )
 
 (component
-  (import "i" (component $c
-    (export "f1" (func))
-    (export "f2" (func (param "p1" string)))
-  ))
-  (instance $i (instantiate $c))
-  (export "run" (func $i "f1"))
+  (component
+    (import "i" (component $c
+      (export "f1" (func))
+      (export "f2" (func (param "p1" string)))
+    ))
+    (instance $i (instantiate $c))
+    (export "run" (func $i "f1"))
+  )
 )
 
-(component
+(component definition
   (import "i" (core module $m
     (export "f1" (func $f1))
     (export "f2" (func $f2 (param i32)))
@@ -29,7 +33,7 @@
   (core instance (instantiate $m2 (with "" (instance (export "" (func $i "f1"))))))
 )
 
-(component
+(component definition
   (import "a" (core module $libc
     (export "memory" (memory 1))
     (export "table" (table 0 funcref))
@@ -62,17 +66,20 @@
 )
 
 (component
-  (import "a" (instance $i
-    (export "a" (func))
-    (export "b" (core module))
-    (export "c" (instance))
-  ))
-  (export "b" (func $i "a"))
-  (export "c" (core module $i "b"))
-  (export "d" (instance $i "c"))
+  (component
+    (import "a" (instance $i
+      (export "a" (func))
+      (export "b" (core module))
+      (export "c" (instance))
+    ))
+    (export "b" (func $i "a"))
+    (export "c" (core module $i "b"))
+    (export "d" (instance $i "c"))
+  )
 )
 
-(component
+
+(component definition
   (import "a" (core module $libc
     (export "memory" (memory 1))
     (export "table" (table 0 funcref))
@@ -193,36 +200,35 @@
 )
 
 ;; multiple projections in alias sugar
-(component $a
-  (import "a" (instance $a
-    (export "a" (instance
+(component
+  (component $a
+    (import "a" (instance $a
       (export "a" (instance
         (export "a" (instance
-          (export "a" (func))
+          (export "a" (instance
+            (export "a" (func))
+          ))
         ))
       ))
     ))
-  ))
 
-  (import "b" (component $b (import "a" (func))))
+    (import "b" (component $b (import "a" (func))))
 
-  (instance (instantiate $b
-    (with "a" (func $a "a" "a" "a" "a"))
-  ))
+    (instance (instantiate $b
+      (with "a" (func $a "a" "a" "a" "a"))
+    ))
+  )
 )
 
 ;; alias some constructs
 (component
-  (import "a" (instance $foo (export "v" (value s32))))
-  (export "v" (value $foo "v"))
-)
-
-(component
-  (import "a" (instance $foo (export "v" (component))))
-  (export "v" (component $foo "v"))
+  (component
+    (import "a" (instance $foo (export "v" (component))))
+    (export "v" (component $foo "v"))
+  )
 )
 
-(component
+(component definition
   (import "a" (instance $foo (export "v" (core module))))
   (export "v" (core module $foo "v"))
 )
@@ -244,10 +250,12 @@
   (export "v" (core module $target))
 )
 
-(component $C
-  (component $m)
-  (alias outer $C $m (component $target))
-  (export "v" (component $target))
+(component
+  (component $C
+    (component $m)
+    (alias outer $C $m (component $target))
+    (export "v" (component $target))
+  )
 )
 
 (assert_invalid
@@ -274,7 +282,7 @@
   (component (alias outer 0 0 (component)))
   "index out of bounds")
 
-(component
+(component definition
   (import "a" (instance $i
      (export "x" (core module))
   ))
@@ -283,9 +291,11 @@
 )
 
 (component
-  (import "a" (instance $i
-     (export "x" (component))
-  ))
-  ;; inline alias injection sugar works for component references
-  (instance (instantiate (component $i "x")))
+  (component
+    (import "a" (instance $i
+       (export "x" (component))
+    ))
+    ;; inline alias injection sugar works for component references
+    (instance (instantiate (component $i "x")))
+  )
 )

tests/cli/component-model/alias.wast

@@ -1,6 +1,6 @@
 ;; RUN: wast --assert default --snapshot tests/snapshots %
 
-(component
+(component definition
   (import "wasi-logging" (instance $logging
     (export "log" (func (param "msg" string)))
   ))

tests/cli/component-model/big.wast

@@ -1,14 +1,18 @@
 ;; RUN: wast --assert default --snapshot tests/snapshots %
 
 (component
-  (import "f" (func $f))
-  (export "f2" (func $f) (func))
+  (component
+    (import "f" (func $f))
+    (export "f2" (func $f) (func))
+  )
 )
 
 ;; subtyping works
 (component
-  (import "f" (instance $i (export "f" (func))))
-  (export "f2" (instance $i) (instance))
+  (component
+    (import "f" (instance $i (export "f" (func))))
+    (export "f2" (instance $i) (instance))
+  )
 )
 
 ;; make sure subtyping works in the right direction

tests/cli/component-model/export-ascription.wast

@@ -1,10 +1,12 @@
 ;; RUN: wast --assert default --snapshot tests/snapshots %
 
 (component
-  (import "x" (func $f))
+  (component
+    (import "x" (func $f))
 
-  (export $g "g" (func $f))
-  (export $g2 "g2" (func $g))
+    (export $g "g" (func $f))
+    (export $g2 "g2" (func $g))
+  )
 )
 
 (component

tests/cli/component-model/export-introduces-alias.wast

@@ -1,4 +1,4 @@
-;; RUN: wast --assert default --snapshot tests/snapshots % -f cm-values
+;; RUN: wast --assert default --snapshot tests/snapshots %
 
 (assert_invalid
   (component (export "" (instance 0)))
@@ -16,42 +16,33 @@
   (component (export "" (func 0)))
   "index out of bounds")
 
-(assert_invalid
-  (component (export "" (value 0)))
-  "index out of bounds")
-
 (component
-  (import "a" (instance $i))
-  (import "b" (core module $m))
-  (import "c" (component $c))
-  (import "d" (value $v string))
-  (import "e" (func $f))
-
-  (export "f" (instance $i))
-  (export "g" (core module $m))
-  (export "h" (component $c))
-  (export "i" (value $v))
-  (export "j" (func $f))
-)
-
-(assert_invalid
   (component
-    (import "a" (value $v string))
-    (export "b" (value $v))
-    (export "c" (value $v))
+    (import "a" (instance $i))
+    (import "b" (core module $m))
+    (import "c" (component $c))
+    (import "e" (func $f))
+
+    (export "f" (instance $i))
+    (export "g" (core module $m))
+    (export "h" (component $c))
+    (export "j" (func $f))
   )
-  "cannot be used more than once")
-
+)
 
 (component
-  (import "a" (func))
-  (export (interface "wasi:http/types@2.0.0") (func 0))
+  (component
+    (import "a" (func))
+    (export (interface "wasi:http/types@2.0.0") (func 0))
+  )
 )
 
 ;; import/exports can overlap on ids
 (component
-  (import (interface "wasi:http/types@2.0.0") (func))
-  (export (interface "wasi:http/types@2.0.0") (func 0))
+  (component
+    (import (interface "wasi:http/types@2.0.0") (func))
+    (export (interface "wasi:http/types@2.0.0") (func 0))
+  )
 )
 
 ;; cannot export some types of strings

tests/cli/component-model/export.wast

@@ -1,12 +1,12 @@
 ;; RUN: wast --assert default --snapshot tests/snapshots %
 
-(component
+(component definition
   (import "a" (func (param "foo" string)))
   (import "b" (func (param "foo" string) (param "bar" s32) (param "baz" u32)))
   (import "c" (func (result (tuple u8))))
 )
 
-(component
+(component definition
   (import "a" (func))
   (import "b" (func (param "p1" string)))
   (import "c" (func (result u32)))
@@ -36,7 +36,7 @@
   "canonical option `memory` is required"
 )
 
-(component
+(component definition
   (import "a" (func $log (param "msg" string)))
   (core module $libc
     (memory (export "memory") 1)

tests/cli/component-model/func.wast

@@ -135,3 +135,31 @@
     (type (sub $t1 (func)))
   )
 )
+
+;; test components with non-mvp types
+(component definition
+  ;; all abstract heap types work
+  (core type (func (param (ref any))))
+  (core type (func (param (ref func))))
+  (core type (func (param (ref extern))))
+  (core type (func (param (ref exn))))
+  (core type (func (param (ref noexn))))
+  (core type (func (param (ref eq))))
+  (core type (func (param (ref struct))))
+  (core type (func (param (ref array))))
+  (core type (func (param (ref nofunc))))
+  (core type (func (param (ref noextern))))
+  (core type (func (param (ref none))))
+  (core type (func (param (ref i31))))
+
+  ;; some shorthands work
+  (core type (func (param anyref)))
+  (core type (func (param eqref)))
+
+  ;; simd types work
+  (core type (func (param v128)))
+
+  ;; types-pointing-to-types works
+  (core type $t (func))
+  (core type (func (param (ref $t))))
+)