Gate synchronous future/stream read/write separately (#13217)

This commit renames the previous `wasm_component_model_async_builtins` feature to
`wasm_component_model_more_async_builtins` and then moves synchronous
future/stream reads/writes behind this feature. This is inspired by
#13212 and corresponds to
WebAssembly/component-model#641 plus bytecodealliance/wasm-tools#2507.

Author: alexcrichton

Cargo.lock

@@ -351,18 +351,18 @@ wit-bindgen = { version = "0.57.0", default-features = false }
 wit-bindgen-rust-macro = { version = "0.57.0", default-features = false }
 
 # wasm-tools family:
-wasmparser = { version = "0.247.0", default-features = false, features = ['simd'] }
-wat = "1.247.0"
-wast = "247.0.0"
-wasmprinter = "0.247.0"
-wasm-encoder = "0.247.0"
-wasm-smith = "0.247.0"
-wasm-mutate = "0.247.0"
-wit-parser = "0.247.0"
-wit-component = "0.247.0"
-wasm-wave = "0.247.0"
-wasm-compose = { version = "0.247.0", default-features = false }
-json-from-wast = "0.247.0"
+wasmparser = { version = "0.248.0", default-features = false, features = ['simd'] }
+wat = "1.248.0"
+wast = "248.0.0"
+wasmprinter = "0.248.0"
+wasm-encoder = "0.248.0"
+wasm-smith = "0.248.0"
+wasm-mutate = "0.248.0"
+wit-parser = "0.248.0"
+wit-component = "0.248.0"
+wasm-wave = "0.248.0"
+wasm-compose = { version = "0.248.0", default-features = false }
+json-from-wast = "0.248.0"
 
 wstd = "0.6.5"
 wasip2 = "1.0"

Cargo.toml

@@ -19,7 +19,7 @@ compile() {
     -O memory-guard-size=0 \
     -O signals-based-traps=n \
     -D guest-debug=y \
-    -W function-references,component-model-async,component-model-async-stackful,component-model-async-builtins,component-model-error-context
+    -W function-references,component-model-async,component-model-async-stackful,component-model-more-async-builtins,component-model-error-context
 }
 
 compile ./tests/all/pulley_provenance_test.wat

ci/miri-provenance-test.sh

@@ -917,9 +917,9 @@ WASMTIME_CONFIG_PROP(void, wasm_component_model_async, bool)
  * component model.
  *
  * For more information see the Rust documentation at
- * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.wasm_component_model_async_builtins.
+ * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.wasm_component_model_more_async_builtins.
  */
-WASMTIME_CONFIG_PROP(void, wasm_component_model_async_builtins, bool)
+WASMTIME_CONFIG_PROP(void, wasm_component_model_more_async_builtins, bool)
 
 /**
  * \brief Configures whether stackful coroutine support is enabled for async

crates/c-api/include/wasmtime/config.h

@@ -697,10 +697,11 @@ public:
    * \brief Configures whether async built-in intrinsics are enabled for the
    * component model.
    *
-   * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.wasm_component_model_async_builtins
+   * https://docs.wasmtime.dev/api/wasmtime/struct.Config.html#method.wasm_component_model_more_async_builtins
    */
-  void wasm_component_model_async_builtins(bool enable) {
-    wasmtime_config_wasm_component_model_async_builtins_set(ptr.get(), enable);
+  void wasm_component_model_more_async_builtins(bool enable) {
+    wasmtime_config_wasm_component_model_more_async_builtins_set(ptr.get(),
+                                                                 enable);
   }
 
   /**

crates/c-api/include/wasmtime/config.hh

@@ -29,11 +29,11 @@ pub extern "C" fn wasmtime_config_wasm_component_model_async_set(
 
 #[unsafe(no_mangle)]
 #[cfg(feature = "component-model-async")]
-pub extern "C" fn wasmtime_config_wasm_component_model_async_builtins_set(
+pub extern "C" fn wasmtime_config_wasm_component_model_more_async_builtins_set(
     c: &mut wasm_config_t,
     enable: bool,
 ) {
-    c.config.wasm_component_model_async_builtins(enable);
+    c.config.wasm_component_model_more_async_builtins(enable);
 }
 
 #[unsafe(no_mangle)]

crates/c-api/src/component/component.rs

@@ -13,9 +13,9 @@ using wasmtime::Store;
 
 TEST(component_async, config) {
   Config config;
-  wasmtime_config_wasm_component_model_async_set(config.capi(), true);
-  wasmtime_config_wasm_component_model_async_builtins_set(config.capi(), true);
-  wasmtime_config_wasm_component_model_async_stackful_set(config.capi(), true);
+  config.wasm_component_model_async(true);
+  config.wasm_component_model_more_async_builtins(true);
+  config.wasm_component_model_async_stackful(true);
   Engine engine(std::move(config));
 }
 

crates/c-api/tests/component/async.cc

@@ -417,7 +417,7 @@ wasmtime_option_group! {
         pub component_model_async: Option<bool>,
         /// Component model support for async lifting/lowering: this corresponds
         /// to the 🚝 emoji in the component model specification.
-        pub component_model_async_builtins: Option<bool>,
+        pub component_model_more_async_builtins: Option<bool>,
         /// Component model support for async lifting/lowering: this corresponds
         /// to the 🚟 emoji in the component model specification.
         pub component_model_async_stackful: Option<bool>,
@@ -1202,7 +1202,7 @@ impl CommonOptions {
         handle_conditionally_compiled! {
             ("component-model", component_model, wasm_component_model)
             ("component-model-async", component_model_async, wasm_component_model_async)
-            ("component-model-async", component_model_async_builtins, wasm_component_model_async_builtins)
+            ("component-model-async", component_model_more_async_builtins, wasm_component_model_more_async_builtins)
             ("component-model-async", component_model_async_stackful, wasm_component_model_async_stackful)
             ("component-model-async", component_model_threading, wasm_component_model_threading)
             ("component-model", component_model_error_context, wasm_component_model_error_context)

crates/cli-flags/src/lib.rs

@@ -1127,15 +1127,21 @@ impl<'a, 'data> Translator<'a, 'data> {
                             core_func_index += 1;
                             LocalInitializer::ErrorContextDrop { func }
                         }
-                        wasmparser::CanonicalFunction::ContextGet(i) => {
+                        wasmparser::CanonicalFunction::ContextGet { slot, ty } => {
+                            if ty != wasmparser::ValType::I32 {
+                                bail!("unsupported context.get type: {ty:?}");
+                            }
                             let func = self.core_func_signature(core_func_index)?;
                             core_func_index += 1;
-                            LocalInitializer::ContextGet { i, func }
+                            LocalInitializer::ContextGet { i: slot, func }
                         }
-                        wasmparser::CanonicalFunction::ContextSet(i) => {
+                        wasmparser::CanonicalFunction::ContextSet { slot, ty } => {
+                            if ty != wasmparser::ValType::I32 {
+                                bail!("unsupported context.set type: {ty:?}");
+                            }
                             let func = self.core_func_signature(core_func_index)?;
                             core_func_index += 1;
-                            LocalInitializer::ContextSet { i, func }
+                            LocalInitializer::ContextSet { i: slot, func }
                         }
                         wasmparser::CanonicalFunction::ThreadIndex => {
                             let func = self.core_func_signature(core_func_index)?;

crates/environ/src/component/translate.rs

@@ -139,7 +139,7 @@ impl Config {
             extended_const,
             wide_arithmetic,
             component_model_async,
-            component_model_async_builtins,
+            component_model_more_async_builtins,
             component_model_async_stackful,
             component_model_threading,
             component_model_error_context,
@@ -163,8 +163,8 @@ impl Config {
         self.module_config.function_references_enabled =
             function_references.or(gc).unwrap_or(false);
         self.module_config.component_model_async = component_model_async.unwrap_or(false);
-        self.module_config.component_model_async_builtins =
-            component_model_async_builtins.unwrap_or(false);
+        self.module_config.component_model_more_async_builtins =
+            component_model_more_async_builtins.unwrap_or(false);
         self.module_config.component_model_async_stackful =
             component_model_async_stackful.unwrap_or(false);
         self.module_config.component_model_threading = component_model_threading.unwrap_or(false);
@@ -304,8 +304,8 @@ impl Config {
         cfg.wasm.async_stack_zeroing = Some(self.wasmtime.async_stack_zeroing);
         cfg.wasm.bulk_memory = Some(self.module_config.config.bulk_memory_enabled);
         cfg.wasm.component_model_async = Some(self.module_config.component_model_async);
-        cfg.wasm.component_model_async_builtins =
-            Some(self.module_config.component_model_async_builtins);
+        cfg.wasm.component_model_more_async_builtins =
+            Some(self.module_config.component_model_more_async_builtins);
         cfg.wasm.component_model_async_stackful =
             Some(self.module_config.component_model_async_stackful);
         cfg.wasm.component_model_threading = Some(self.module_config.component_model_threading);