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

library/core/src/lib.rs

@@ -153,11 +153,21 @@
 #![feature(const_slice_from_ref)]
 //
 // Language features:
+#![feature(abi_amdgpu_kernel)]
+#![feature(abi_avr_interrupt)]
+#![feature(abi_c_cmse_nonsecure_call)]
+#![feature(abi_efiapi)]
+#![feature(abi_msp430_interrupt)]
+#![feature(abi_ptx)]
+#![feature(abi_thiscall)]
 #![feature(abi_unadjusted)]
+#![feature(abi_vectorcall)]
+#![feature(abi_x86_interrupt)]
 #![feature(allow_internal_unsafe)]
 #![feature(allow_internal_unstable)]
 #![feature(associated_type_bounds)]
 #![feature(auto_traits)]
+#![feature(c_unwind)]
 #![feature(cfg_target_has_atomic)]
 #![feature(const_fn_floating_point_arithmetic)]
 #![feature(const_fn_fn_ptr_basics)]
@@ -202,6 +212,7 @@
 #![feature(try_blocks)]
 #![feature(unboxed_closures)]
 #![feature(unsized_fn_params)]
+#![feature(wasm_abi)]
 #![feature(asm_const)]
 //
 // Target features:

library/core/src/ptr/mod.rs

@@ -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),* }
     };
 }
 

src/test/ui/function-pointer/function-pointer-impls.rs

@@ -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)>();
+}