Skip to content

Convert Windows to use check_shim_sig instead of check_shim_sig_lenient #4779

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

Open
CraftSpider wants to merge 3 commits into
base: master
Choose a base branch
from
+499 −123
Open

Convert Windows to use check_shim_sig instead of check_shim_sig_lenient #4779

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c0a027c
Convert Windows to use check_shim_sig instead of check_shim_sig_lenient
CraftSpider Dec 19, 2025
9cebf4e
Fix new FlushFileBuffers function
CraftSpider Dec 19, 2025
25047ae
Fix return type of _Unwind_RaiseException
CraftSpider Dec 19, 2025
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
8 changes: 5 additions & 3 deletions src/shims/sig.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,11 +17,11 @@ pub struct ShimSig<'tcx, const ARGS: usize> {

/// Construct a `ShimSig` with convenient syntax:
/// ```rust,ignore
/// shim_sig!(this, extern "C" fn (*const T, i32) -> usize)
/// shim_sig!(extern "C" fn (*const T, i32) -> usize)
/// ```
#[macro_export]
macro_rules! shim_sig {
(extern $abi:literal fn($($arg:ty),*) -> $ret:ty) => {
(extern $abi:literal fn($($arg:ty),* $(,)?) -> $ret:ty) => {
|this| $crate::shims::sig::ShimSig {
abi: std::str::FromStr::from_str($abi).expect("incorrect abi specified"),
args: [$(shim_sig_arg!(this, $arg)),*],
Expand Down Expand Up @@ -53,7 +53,9 @@ macro_rules! shim_sig_arg {
"*const _" => $this.machine.layouts.const_raw_ptr.ty,
"*mut _" => $this.machine.layouts.mut_raw_ptr.ty,
ty if let Some(libc_ty) = ty.strip_prefix("libc::") => $this.libc_ty_layout(libc_ty).ty,
ty => panic!("unsupported signature type {ty:?}"),
ty if let Some(win_ty) = ty.strip_prefix("winapi::") =>
Copy link
Contributor Author

@CraftSpider CraftSpider Dec 19, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This is shorthand for a longer path used by the windows_ty_layout function, I thought this made usage a lot nicer and more readable.

$this.windows_ty_layout(win_ty).ty,
ty => helpers::path_ty_layout($this, &ty.split("::").collect::<Vec<_>>()).ty,
}
}};
}
Expand Down
Loading