Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

replace Vec<T> with Box<[T]> #5350

Merged
merged 1 commit into from
May 9, 2024
+9 −17
Merged

replace Vec<T> with Box<[T]> #5350

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 9 additions & 17 deletions rust/src/callingconvention.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,23 +89,15 @@ where
*count = len;

if len == 0 {
ptr::null_mut()
} else {
let mut res = Vec::with_capacity(len + 1);

res.push(len as u32);

for i in items {
res.push(i);
}

assert!(res.len() == len + 1);
return ptr::null_mut();
}

let raw = res.as_mut_ptr();
mem::forget(res);
let res: Box<[_]> = [len as u32].into_iter().chain(items).collect();
debug_assert!(res.len() == len + 1);

unsafe { raw.offset(1) }
}
// it's free on the function below: `cb_free_register_list`
let raw = Box::leak(res);
&mut raw[1]
}

extern "C" fn cb_free_register_list(_ctxt: *mut c_void, regs: *mut u32) {
Expand All @@ -115,8 +107,8 @@ where
}

let actual_start = regs.offset(-1);
let len = *actual_start + 1;
let _regs = Vec::from_raw_parts(actual_start, len as usize, len as usize);
let len = (*actual_start) + 1;
let _regs = Box::from_raw(ptr::slice_from_raw_parts_mut(actual_start, len as usize));
})
}

Expand Down
Loading