Implement component model resources in Wasmtime

crates/component-macro/src/component.rs

@@ -353,7 +353,7 @@ fn expand_record_for_component_type(
             #[inline]
             fn typecheck(
                 ty: &#internal::InterfaceType,
-                types: &#internal::ComponentTypes,
+                types: &#internal::InstanceType<'_>,
             ) -> #internal::anyhow::Result<()> {
                 #internal::#typecheck(ty, types, &[#typecheck_argument])
             }
@@ -422,7 +422,7 @@ impl Expander for LiftExpander {
             unsafe impl #impl_generics wasmtime::component::Lift for #name #ty_generics #where_clause {
                 #[inline]
                 fn lift(
-                    cx: &#internal::LiftContext<'_>,
+                    cx: &mut #internal::LiftContext<'_>,
                     ty: #internal::InterfaceType,
                     src: &Self::Lower,
                 ) -> #internal::anyhow::Result<Self> {
@@ -434,7 +434,7 @@ impl Expander for LiftExpander {
 
                 #[inline]
                 fn load(
-                    cx: &#internal::LiftContext<'_>,
+                    cx: &mut #internal::LiftContext<'_>,
                     ty: #internal::InterfaceType,
                     bytes: &[u8],
                 ) -> #internal::anyhow::Result<Self> {
@@ -525,7 +525,7 @@ impl Expander for LiftExpander {
             unsafe impl #impl_generics wasmtime::component::Lift for #name #ty_generics #where_clause {
                 #[inline]
                 fn lift(
-                    cx: &#internal::LiftContext<'_>,
+                    cx: &mut #internal::LiftContext<'_>,
                     ty: #internal::InterfaceType,
                     src: &Self::Lower,
                 ) -> #internal::anyhow::Result<Self> {
@@ -538,7 +538,7 @@ impl Expander for LiftExpander {
 
                 #[inline]
                 fn load(
-                    cx: &#internal::LiftContext<'_>,
+                    cx: &mut #internal::LiftContext<'_>,
                     ty: #internal::InterfaceType,
                     bytes: &[u8],
                 ) -> #internal::anyhow::Result<Self> {
@@ -888,7 +888,7 @@ impl Expander for ComponentTypeExpander {
                 #[inline]
                 fn typecheck(
                     ty: &#internal::InterfaceType,
-                    types: &#internal::ComponentTypes,
+                    types: &#internal::InstanceType<'_>,
                 ) -> #internal::anyhow::Result<()> {
                     #internal::#typecheck(ty, types, &[#case_names_and_checks])
                 }
@@ -1312,7 +1312,7 @@ pub fn expand_flags(flags: &Flags) -> Result<TokenStream> {
 
         unsafe impl wasmtime::component::Lift for #name {
             fn lift(
-                cx: &#internal::LiftContext<'_>,
+                cx: &mut #internal::LiftContext<'_>,
                 _ty: #internal::InterfaceType,
                 src: &Self::Lower,
             ) -> #internal::anyhow::Result<Self> {
@@ -1328,7 +1328,7 @@ pub fn expand_flags(flags: &Flags) -> Result<TokenStream> {
             }
 
             fn load(
-                cx: &#internal::LiftContext<'_>,
+                cx: &mut #internal::LiftContext<'_>,
                 _ty: #internal::InterfaceType,
                 bytes: &[u8],
             ) -> #internal::anyhow::Result<Self> {

crates/cranelift-shared/src/lib.rs

@@ -56,9 +56,17 @@ fn to_flag_value(v: &settings::Value) -> FlagValue {
 /// Trap code used for debug assertions we emit in our JIT code.
 const DEBUG_ASSERT_TRAP_CODE: u16 = u16::MAX;
 
-/// Code used as the user-defined trap code.
+/// A custom code with `TrapCode::User` which is used by always-trap shims which
+/// indicates that, as expected, the always-trapping function indeed did trap.
+/// This effectively provides a better error message as opposed to a bland
+/// "unreachable code reached"
 pub const ALWAYS_TRAP_CODE: u16 = 100;
 
+/// A custom code with `TrapCode::User` corresponding to being unable to reenter
+/// a component due to its reentrance limitations. This is used in component
+/// adapters to provide a more useful error message in such situations.
+pub const CANNOT_ENTER_CODE: u16 = 101;
+
 /// Converts machine traps to trap information.
 pub fn mach_trap_to_trap(trap: &MachTrap) -> Option<TrapInformation> {
     let &MachTrap { offset, code } = trap;
@@ -77,6 +85,7 @@ pub fn mach_trap_to_trap(trap: &MachTrap) -> Option<TrapInformation> {
             ir::TrapCode::UnreachableCodeReached => Trap::UnreachableCodeReached,
             ir::TrapCode::Interrupt => Trap::Interrupt,
             ir::TrapCode::User(ALWAYS_TRAP_CODE) => Trap::AlwaysTrapAdapter,
+            ir::TrapCode::User(CANNOT_ENTER_CODE) => Trap::CannotEnterComponent,
             ir::TrapCode::NullReference => Trap::NullReference,
 
             // These do not get converted to wasmtime traps, since they

crates/cranelift/src/compiler.rs

@@ -351,7 +351,6 @@ impl wasmtime_environ::Compiler for Compiler {
 
     fn compile_wasm_to_native_trampoline(
         &self,
-        translation: &ModuleTranslation,
         wasm_func_ty: &WasmFuncType,
     ) -> Result<Box<dyn Any + Send>, CompileError> {
         let isa = &*self.isa;
@@ -379,14 +378,14 @@ impl wasmtime_environ::Compiler for Compiler {
             caller_vmctx,
             wasmtime_environ::VMCONTEXT_MAGIC,
         );
-        let offsets = VMOffsets::new(isa.pointer_bytes(), &translation.module);
+        let ptr = isa.pointer_bytes();
         let limits = builder.ins().load(
             pointer_type,
             MemFlags::trusted(),
             caller_vmctx,
-            i32::try_from(offsets.vmctx_runtime_limits()).unwrap(),
+            i32::try_from(ptr.vmcontext_runtime_limits()).unwrap(),
         );
-        save_last_wasm_exit_fp_and_pc(&mut builder, pointer_type, &offsets.ptr, limits);
+        save_last_wasm_exit_fp_and_pc(&mut builder, pointer_type, &ptr, limits);
 
         // If the native call signature for this function uses a return pointer
         // then allocate the return pointer here on the stack and pass it as the