mii/wasmer
1
0
Fork 0
mirror of https://github.com/mii443/wasmer.git synced 2025-12-08 13:48:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update boxed_vec to deal with boxed values

Browse Source
This commit is contained in:
Mark McCaskey
2020-10-02 16:33:03 -07:00
parent 34e6139570
commit e6c61c74ff
3 changed files with 6 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/c-api/src/wasm_c_api/macros.rs
View File

@@ -131,12 +131,14 @@ macro_rules! wasm_declare_boxed_vec {
// TODO: do this properly
impl [<wasm_ $name _vec_t>] {
pub unsafe fn into_slice(&self) -> Option<&[*mut [<wasm_ $name _t>]]>{
pub unsafe fn into_slice(&self) -> Option<&[Box<[<wasm_ $name _t>]>]>{
if self.data.is_null() {
return None;
}
Some(::std::slice::from_raw_parts(self.data, self.size))
let slice: &[*mut [<wasm_ $name _t>]] = ::std::slice::from_raw_parts(self.data, self.size);
let slice: &[Box<[<wasm_ $name _t>]>] = ::std::mem::transmute(slice);
Some(slice)
}
}

1
lib/c-api/src/wasm_c_api/module.rs
View File

@@ -3,7 +3,6 @@ use super::types::{
wasm_byte_vec_t, wasm_exporttype_t, wasm_exporttype_vec_t, wasm_importtype_t,
wasm_importtype_vec_t,
};
use std::mem;
use std::ptr::NonNull;
use std::slice;
use std::sync::Arc;

4
lib/c-api/src/wasm_c_api/types/function.rs
View File

@@ -42,13 +42,13 @@ unsafe fn wasm_functype_new_inner(
let params: Vec<ValType> = params
.into_slice()?
.iter()
.map(|&ptr| *ptr)
.map(|ptr| **ptr)
.map(Into::into)
.collect::<Vec<_>>();
let results: Vec<ValType> = results
.into_slice()?
.iter()
.map(|&ptr| *ptr)
.map(|ptr| **ptr)
.map(Into::into)
.collect::<Vec<_>>();