Skip to content

Implement Debug, Pointer, etc on function pointers for all calling conventions #92964

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.

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

Closed
wants to merge 6 commits into from
Closed
Show file tree
Hide file tree
Changes from 1 commit
Commits
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
67 changes: 54 additions & 13 deletions library/core/src/ptr/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1451,21 +1451,62 @@ macro_rules! fnptr_impls_safety_abi {
}
}

macro_rules! fnptr_impls_args {
($($Arg: ident),+) => {
fnptr_impls_safety_abi! { extern "Rust" fn($($Arg),+) -> Ret, $($Arg),+ }
fnptr_impls_safety_abi! { extern "C" fn($($Arg),+) -> Ret, $($Arg),+ }
fnptr_impls_safety_abi! { extern "C" fn($($Arg),+ , ...) -> Ret, $($Arg),+ }
fnptr_impls_safety_abi! { unsafe extern "Rust" fn($($Arg),+) -> Ret, $($Arg),+ }
fnptr_impls_safety_abi! { unsafe extern "C" fn($($Arg),+) -> Ret, $($Arg),+ }
fnptr_impls_safety_abi! { unsafe extern "C" fn($($Arg),+ , ...) -> Ret, $($Arg),+ }
macro_rules! fnptr_impl_for_abi {
($Abi:tt, $($Arg: ident),*) => {
fnptr_impls_safety_abi! { extern $Abi fn($($Arg),*) -> Ret, $($Arg),* }
fnptr_impls_safety_abi! { unsafe extern $Abi fn($($Arg),*) -> Ret, $($Arg),* }
};
() => {
}

macro_rules! fnptr_impl_for_abi_variadic_support {
($Abi:tt, ) => {
// No variadic functions with 0 parameters
fnptr_impls_safety_abi! { extern "Rust" fn() -> Ret, }
fnptr_impls_safety_abi! { extern "C" fn() -> Ret, }
fnptr_impls_safety_abi! { unsafe extern "Rust" fn() -> Ret, }
fnptr_impls_safety_abi! { unsafe extern "C" fn() -> Ret, }
fnptr_impls_safety_abi! { extern $Abi fn() -> Ret, }
fnptr_impls_safety_abi! { unsafe extern $Abi fn() -> Ret, }
};

($Abi:tt, $($Arg: ident),*) => {
fnptr_impl_for_abi! { $Abi, $($Arg),* }

fnptr_impls_safety_abi! { extern $Abi fn($($Arg),*, ...) -> Ret, $($Arg),* }
fnptr_impls_safety_abi! { unsafe extern $Abi fn($($Arg),*, ...) -> Ret, $($Arg),* }
}
}

macro_rules! fnptr_impls_args {
($($Arg: ident),*) => {
fnptr_impl_for_abi! { "Rust", $($Arg),* }
fnptr_impl_for_abi! { "stdcall", $($Arg),* }
fnptr_impl_for_abi! { "fastcall", $($Arg),* }
fnptr_impl_for_abi! { "aapcs", $($Arg),* }
fnptr_impl_for_abi! { "win64", $($Arg),* }
fnptr_impl_for_abi! { "sysv64", $($Arg),* }
fnptr_impl_for_abi! { "system", $($Arg),* }
fnptr_impl_for_abi! { "rust-intrinsic", $($Arg),* }
fnptr_impl_for_abi! { "rust-call", $($Arg),* }
fnptr_impl_for_abi! { "platform-intrinsic", $($Arg),* }
fnptr_impl_for_abi! { "unadjusted", $($Arg),* }

// fnptr_impl_for_abi! { "C-unwind", $($Arg),* }
// fnptr_impl_for_abi! { "stdcall-unwind", $($Arg),* }
// fnptr_impl_for_abi! { "vectorcall", $($Arg),* }
// fnptr_impl_for_abi! { "thiscall", $($Arg),* }
// fnptr_impl_for_abi! { "thiscall-unwind", $($Arg),* }

// fnptr_impl_for_abi! { "ptx-kernel", $($Arg),* }
// fnptr_impl_for_abi! { "msp430-interrupt", $($Arg),* }
// fnptr_impl_for_abi! { "x86-interrupt", $($Arg),* }
// fnptr_impl_for_abi! { "amdgpu-kernel", $($Arg),* }
// fnptr_impl_for_abi! { "efiapi", $($Arg),* }
// fnptr_impl_for_abi! { "avr-interrupt", $($Arg),* }
// fnptr_impl_for_abi! { "avr-non-blocking-interrupt", $($Arg),* }
// fnptr_impl_for_abi! { "C-cmse-nonsecure-call", $($Arg),* }
// fnptr_impl_for_abi! { "wasm", $($Arg),* }

// fnptr_impl_for_abi! { "system-unwind", $($Arg),* }

fnptr_impl_for_abi_variadic_support! { "C", $($Arg),* }
fnptr_impl_for_abi_variadic_support! { "cdecl", $($Arg),* }
};
}

Expand Down
11 changes: 11 additions & 0 deletions src/test/ui/function-pointer/function-pointer-impls.rs
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
// check-pass
fn assert_debug<T: std::fmt::Debug>() {}

fn main() {
assert_debug::<extern "C" fn()>();
assert_debug::<extern "C" fn(argument: u32)>();
assert_debug::<unsafe extern "C" fn(argument: u32)>();
assert_debug::<unsafe extern "C" fn(argument: u32, ...)>();
assert_debug::<fn(argument: u32)>();
assert_debug::<extern "fastcall" fn(argument: u32)>();
}