diff --git a/crates/api/src/trampoline/func.rs b/crates/api/src/trampoline/func.rs index 95b17631ff..4b05a98d19 100644 --- a/crates/api/src/trampoline/func.rs +++ b/crates/api/src/trampoline/func.rs @@ -58,7 +58,7 @@ unsafe extern "C" fn stub_fn(vmctx: *mut VMContext, call_id: u32, values_vec: *m Ok(()) => { for i in 0..returns_len { // TODO check signature.returns[i].value_type ? - returns[i].write_value_to(values_vec.offset(i as isize)); + returns[i].write_value_to(values_vec.add(i)); } 0 } diff --git a/crates/api/src/wasm.rs b/crates/api/src/wasm.rs index 6a0d18ab8c..87d95beff1 100644 --- a/crates/api/src/wasm.rs +++ b/crates/api/src/wasm.rs @@ -460,13 +460,13 @@ pub unsafe extern "C" fn wasm_func_call( let func = (*func).func.borrow(); let mut params = Vec::with_capacity(func.param_arity()); for i in 0..func.param_arity() { - let val = &(*args.offset(i as isize)); + let val = &(*args.add(i)); params.push(val.val()); } match func.call(¶ms) { Ok(out) => { for i in 0..func.result_arity() { - let val = &mut (*results.offset(i as isize)); + let val = &mut (*results.add(i)); *val = wasm_val_t::from_val(&out[i]); } ptr::null_mut() @@ -666,7 +666,7 @@ pub unsafe extern "C" fn wasm_instance_new( let store = &(*store).store; let mut externs: Vec = Vec::with_capacity((*module).imports.len()); for i in 0..(*module).imports.len() { - let import = *imports.offset(i as isize); + let import = *imports.add(i); externs.push((*import).ext.clone()); } let module = &(*module).module; diff --git a/crates/misc/py/src/import.rs b/crates/misc/py/src/import.rs index 41c903ec8a..6095db9815 100644 --- a/crates/misc/py/src/import.rs +++ b/crates/misc/py/src/import.rs @@ -71,12 +71,7 @@ unsafe extern "C" fn stub_fn(vmctx: *mut VMContext, call_id: u32, values_vec: *m } result.clone_ref(py) }; - write_value_to( - py, - values_vec.offset(i as isize), - signature.returns[i].value_type, - val, - ); + write_value_to(py, values_vec.add(i), signature.returns[i].value_type, val); } }