Bump to 36.0.0 (#293)

Author: alexcrichton

VERSION

@@ -1 +1 @@
-35.0.0
+36.0.0

ci/download-wasmtime.py

@@ -12,7 +12,7 @@
 
 # set to "dev" to download the latest or pick a tag from
 # https://github.com/bytecodealliance/wasmtime/tags
-WASMTIME_VERSION = "v35.0.0"
+WASMTIME_VERSION = "v36.0.0"
 
 
 def main(platform, arch):

rust/Cargo.lock

@@ -12,7 +12,7 @@ heck = { version = "0.4", features = ["unicode"] }
 wit-parser = "0.230.0"
 wit-component = "0.230.0"
 indexmap = "2.0"
-wasmtime-environ = { version = "35.0.0", features = ['component-model', 'compile'] }
+wasmtime-environ = { version = "36.0.0", features = ['component-model', 'compile'] }
 wit-bindgen = "0.42.1"
 wit-bindgen-core = "0.42.1"
 

rust/Cargo.toml

@@ -35,10 +35,10 @@ use std::collections::{BTreeMap, BTreeSet, HashMap};
 use std::fmt::Write;
 use std::mem;
 use wasmtime_environ::component::{
-    CanonicalOptions, CanonicalOptionsDataModel, Component, ComponentTypes, ComponentTypesBuilder,
-    CoreDef, CoreExport, Export, ExportItem, GlobalInitializer, InstantiateModule, InterfaceType,
-    LoweredIndex, RuntimeImportIndex, RuntimeInstanceIndex, StaticModuleIndex, StringEncoding,
-    Trampoline, TrampolineIndex, Translator, TypeFuncIndex, TypeResourceTableIndex,
+    CanonicalOptionsDataModel, Component, ComponentTypes, ComponentTypesBuilder, CoreDef,
+    CoreExport, Export, ExportItem, GlobalInitializer, InstantiateModule, InterfaceType,
+    LoweredIndex, OptionsIndex, RuntimeImportIndex, RuntimeInstanceIndex, StaticModuleIndex,
+    StringEncoding, Trampoline, TrampolineIndex, Translator, TypeFuncIndex, TypeResourceTableIndex,
 };
 use wasmtime_environ::prelude::*;
 use wasmtime_environ::{EntityIndex, ModuleTranslation, PrimaryMap, ScopeVec, Tunables};
@@ -75,7 +75,7 @@ pub struct WasmtimePy {
     imported_interfaces: HashMap<InterfaceId, String>,
     exported_interfaces: HashMap<InterfaceId, String>,
 
-    lowerings: PrimaryMap<LoweredIndex, (TrampolineIndex, TypeFuncIndex, CanonicalOptions)>,
+    lowerings: PrimaryMap<LoweredIndex, (TrampolineIndex, TypeFuncIndex, OptionsIndex)>,
     resource_trampolines: Vec<(TrampolineIndex, Trampoline)>,
 }
 
@@ -551,7 +551,7 @@ struct Instantiator<'a> {
 
 struct Lift<'a> {
     callee: String,
-    opts: &'a CanonicalOptions,
+    opts: OptionsIndex,
     func: &'a Function,
     interface: Option<InterfaceId>,
 }
@@ -845,7 +845,7 @@ impl<'a> Instantiator<'a> {
         self.bindgen(
             params,
             callee,
-            &options,
+            options,
             func,
             AbiVariant::GuestImport,
             "self",
@@ -880,14 +880,15 @@ impl<'a> Instantiator<'a> {
         &mut self,
         params: Vec<String>,
         callee: String,
-        opts: &CanonicalOptions,
+        opts: OptionsIndex,
         func: &Function,
         abi: AbiVariant,
         this: &str,
         interface: Option<InterfaceId>,
         at_root: bool,
         resource_map: Option<&ResourceMap>,
     ) {
+        let opts = &self.component.options[opts];
         // Technically it wouldn't be the hardest thing in the world to support
         // other string encodings, but for now the code generator was originally
         // written to support utf-8 so let's just leave it at that for now. In
@@ -1020,7 +1021,7 @@ impl<'a> Instantiator<'a> {
                     };
                     toplevel.push(Lift {
                         callee,
-                        opts: options,
+                        opts: *options,
                         func,
                         interface: None,
                     });
@@ -1046,7 +1047,7 @@ impl<'a> Instantiator<'a> {
                         self.create_resource_fn_map(func, func_ty, &mut resource_map);
                         lifts.push(Lift {
                             callee,
-                            opts: options,
+                            opts: *options,
                             func,
                             interface: Some(id),
                         });

rust/src/bindgen.rs

@@ -3928,7 +3928,7 @@ def wasmtime_component_linker_instance_add_module(linker_instance: Any, name: An
 
 _wasmtime_component_linker_instance_add_func = dll.wasmtime_component_linker_instance_add_func
 _wasmtime_component_linker_instance_add_func.restype = POINTER(wasmtime_error_t)
-_wasmtime_component_linker_instance_add_func.argtypes = [POINTER(wasmtime_component_linker_instance_t), POINTER(c_char), c_size_t, wasmtime_component_func_callback_t, c_void_p, CFUNCTYPE(None)]
+_wasmtime_component_linker_instance_add_func.argtypes = [POINTER(wasmtime_component_linker_instance_t), POINTER(c_char), c_size_t, wasmtime_component_func_callback_t, c_void_p, CFUNCTYPE(None, c_void_p)]
 def wasmtime_component_linker_instance_add_func(linker_instance: Any, name: Any, name_len: Any, callback: Any, data: Any, finalizer: Any) -> ctypes._Pointer:
     return _wasmtime_component_linker_instance_add_func(linker_instance, name, name_len, callback, data, finalizer)  # type: ignore