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

fixup

Browse Source
This commit is contained in:
Ivan Enderlin
2020-12-01 15:29:41 +01:00
parent 527b7061cc
commit 25bcc9b7fc
1 changed files with 17 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -25,14 +25,17 @@ macro_rules! wasm_declare_vec {
}
impl<'a> From<Vec<[<wasm_ $name _t>]>> for [<wasm_ $name _vec_t>] {
fn from(other: Vec<[<wasm_ $name _t>]>) -> Self {
let mut boxed_slice = other.into_boxed_slice();
let size = boxed_slice.len();
let data = boxed_slice.as_mut_ptr();
::std::mem::forget(boxed_slice);
fn from(mut vec: Vec<[<wasm_ $name _t>]>) -> Self {
vec.shrink_to_fit();
let length = vec.len();
let pointer = vec.as_mut_ptr();
::std::mem::forget(vec);
Self {
size,
data,
size: length,
data: pointer,
}
}
}
@@ -100,20 +103,19 @@ macro_rules! wasm_declare_vec {
::std::mem::forget(bytes);
}
#[no_mangle]
pub unsafe extern "C" fn [<wasm_ $name _vec_delete>](ptr: Option<Box<[<wasm_ $name _vec_t>]>>) {
if ptr.is_none() {
pub unsafe extern "C" fn [<wasm_ $name _vec_delete>](subject: Option<Box<[<wasm_ $name _vec_t>]>>) {
if subject.is_none() {
return;
}
let mut vec = ptr.unwrap();
let subject: Box<[<wasm_ $name _vec_t>]> = subject.unwrap();
if !vec.data.is_null() {
let _ = Vec::from_raw_parts(vec.data, vec.size, vec.size);
vec.data = ::std::ptr::null_mut();
vec.size = 0;
if !subject.data.is_null() {
let _ = Vec::from_raw_parts(subject.data, subject.size, subject.size);
}
::std::ptr::drop_in_place(Box::into_raw(subject));
}
}