From 561f9e084a01395f84b534c44f98ddf70affcae2 Mon Sep 17 00:00:00 2001 From: Pat Hickey Date: Thu, 21 May 2020 14:21:47 -0700 Subject: [PATCH] wig: bugfixes (sorry, thought i had tested before committimg) --- crates/wasi-common/wig/src/wasi.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/crates/wasi-common/wig/src/wasi.rs b/crates/wasi-common/wig/src/wasi.rs index ca113250e1..579e6f3ca1 100644 --- a/crates/wasi-common/wig/src/wasi.rs +++ b/crates/wasi-common/wig/src/wasi.rs @@ -473,7 +473,7 @@ pub fn define_struct_for_wiggle(args: TokenStream) -> TokenStream { // Therefore, creating a new BorrowChecker at the // root of each function invocation is correct. let bc = wiggle::BorrowChecker::new(); - let mem: WasiMemory { mem, bc }; + let mem = WasiMemory { mem, bc }; wasi_common::wasi::#module_id::#name_ident( &mut my_cx.borrow_mut(), &mem, @@ -493,11 +493,11 @@ pub fn define_struct_for_wiggle(args: TokenStream) -> TokenStream { struct WasiMemory { mem: wasmtime::Memory, bc: wiggle::BorrowChecker, - }; + } unsafe impl wiggle::GuestMemory for WasiMemory { fn base(&self) -> (*mut u8, u32) { - (self.0.data_ptr(), self.0.data_size() as _) + (self.mem.data_ptr(), self.mem.data_size() as _) } fn borrow_checker(&self) -> &wiggle::BorrowChecker { &self.bc