Add FnPtrArg for unsafe

Author: lucic71

cpp2rust/converter/converter.cpp

@@ -4098,7 +4098,7 @@ std::string Converter::GetRecordName(const clang::NamedDecl *decl) const {
 std::vector<const char *>
 Converter::GetStructAttributes(const clang::RecordDecl *decl) {
   if (decl->isUnion()) {
-    return {"Copy", "Clone"};
+    return {"Copy", "Clone", "FnPtrArg"};
   }
 
   std::vector<const char *> struct_attrs;
@@ -4113,6 +4113,7 @@ Converter::GetStructAttributes(const clang::RecordDecl *decl) {
 
   if (RecordImplementsClone(decl)) {
     struct_attrs.emplace_back("VaArg");
+    struct_attrs.emplace_back("FnPtrArg");
   }
 
   if (RecordDerivesDefault(decl)) {

libcc2rs/src/fn_ptr_arg.rs

@@ -130,6 +130,49 @@ impl FnPtrArg for AnyPtr {
     }
 }
 
+impl<T: ?Sized + 'static> FnPtrArg for *mut T {
+    #[inline]
+    fn to_repr(&self) -> ArgRepr<'_> {
+        ArgRepr::Record(self)
+    }
+    fn from_repr(r: &ArgRepr) -> Self {
+        record_from_repr(r)
+    }
+}
+
+impl<T: ?Sized + 'static> FnPtrArg for *const T {
+    #[inline]
+    fn to_repr(&self) -> ArgRepr<'_> {
+        ArgRepr::Record(self)
+    }
+    fn from_repr(r: &ArgRepr) -> Self {
+        record_from_repr(r)
+    }
+}
+
+macro_rules! impl_fn_ptr_arg_unsafe_fn {
+    () => {
+        impl_fn_ptr_arg_unsafe_fn!(@gen A B C D E F G H I J K L M N O P);
+    };
+    (@gen $($a:ident)*) => {
+        impl<R: 'static $(, $a: 'static)*> FnPtrArg for Option<unsafe fn($($a,)*) -> R> {
+            #[inline]
+            fn to_repr(&self) -> ArgRepr<'_> {
+                ArgRepr::Record(self)
+            }
+            fn from_repr(r: &ArgRepr) -> Self {
+                record_from_repr(r)
+            }
+        }
+        impl_fn_ptr_arg_unsafe_fn!(@peel $($a)*);
+    };
+    (@peel) => {};
+    (@peel $head:ident $($tail:ident)*) => {
+        impl_fn_ptr_arg_unsafe_fn!(@gen $($tail)*);
+    };
+}
+impl_fn_ptr_arg_unsafe_fn!();
+
 pub fn record_from_repr<T: Any + Clone>(r: &ArgRepr) -> T {
     match r {
         ArgRepr::Record(v) => v

tests/multi-file/cross_tu_tag_collision/out/unsafe/cross_tu_tag_collision.rs

@@ -7,7 +7,7 @@ use std::io::{Read, Seek, Write};
 use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
 use std::rc::Rc;
 #[repr(C)]
-#[derive(Copy, Clone, VaArg, Default)]
+#[derive(Copy, Clone, VaArg, FnPtrArg, Default)]
 pub struct widget {
     pub id: i32,
 }

tests/multi-file/friend_operator/out/unsafe/friend_operator.rs

@@ -7,7 +7,7 @@ use std::io::{Read, Seek, Write};
 use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
 use std::rc::Rc;
 #[repr(C)]
-#[derive(Copy, Clone, VaArg, Default)]
+#[derive(Copy, Clone, VaArg, FnPtrArg, Default)]
 pub struct S {
     pub a: i32,
     pub b: i32,

tests/multi-file/opaque_forward_decl/out/unsafe/opaque_forward_decl.rs

@@ -7,7 +7,7 @@ use std::io::{Read, Seek, Write};
 use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
 use std::rc::Rc;
 #[repr(C)]
-#[derive(Copy, Clone, VaArg, Default)]
+#[derive(Copy, Clone, VaArg, FnPtrArg, Default)]
 pub struct container {
     pub p: *mut opaque,
     pub x: i32,

tests/multi-file/out_of_line_methods_cross_tu/out/unsafe/out_of_line_methods_cross_tu.rs

@@ -7,7 +7,7 @@ use std::io::{Read, Seek, Write};
 use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
 use std::rc::Rc;
 #[repr(C)]
-#[derive(Copy, Clone, VaArg, Default)]
+#[derive(Copy, Clone, VaArg, FnPtrArg, Default)]
 pub struct S {
     pub v: i32,
 }
@@ -20,7 +20,7 @@ pub unsafe trait Base {
     unsafe fn apply(&mut self, x: i32) -> i32;
 }
 #[repr(C)]
-#[derive(Copy, Clone, VaArg, Default)]
+#[derive(Copy, Clone, VaArg, FnPtrArg, Default)]
 pub struct Derived {
     pub factor: i32,
 }

tests/multi-file/template_method_late_instantiation/out/unsafe/template_method_late_instantiation.rs

@@ -7,7 +7,7 @@ use std::io::{Read, Seek, Write};
 use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
 use std::rc::Rc;
 #[repr(C)]
-#[derive(Copy, Clone, VaArg)]
+#[derive(Copy, Clone, VaArg, FnPtrArg)]
 pub struct S_int_ {
     pub x: i32,
 }

tests/ub/out/unsafe/ctor_ref_member.rs

@@ -7,7 +7,7 @@ use std::io::{Read, Seek, Write};
 use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
 use std::rc::Rc;
 #[repr(C)]
-#[derive(Copy, Clone, VaArg, Default)]
+#[derive(Copy, Clone, VaArg, FnPtrArg, Default)]
 pub struct S {
     pub r: *const i32,
 }

tests/ub/out/unsafe/ub6.rs

@@ -7,7 +7,7 @@ use std::io::{Read, Seek, Write};
 use std::os::fd::{AsFd, FromRawFd, IntoRawFd};
 use std::rc::Rc;
 #[repr(C)]
-#[derive(Copy, Clone, VaArg, Default)]
+#[derive(Copy, Clone, VaArg, FnPtrArg, Default)]
 pub struct Pair {
     pub x1: *mut i32,
     pub x2: *mut i32,

tests/unit/out/refcount/lambda_basic.rs

@@ -33,6 +33,15 @@ fn main_0() -> i32 {
         }),
     ));
     assert!((({ (*three.borrow_mut())(1, 2, 3,) }) == 123));
+    let k: Value<i32> = Rc::new(RefCell::new(3));
+    let m: Value<i32> = Rc::new(RefCell::new(4));
+    let constants: Value<_> = Rc::new(RefCell::new(
+        (|x: i32| {
+            let x: Value<i32> = Rc::new(RefCell::new(x));
+            return (((*x.borrow()) + (*k.borrow())) + (*m.borrow()));
+        }),
+    ));
+    assert!((({ (*constants.borrow_mut())(1,) }) == 8));
     return 0;
 }
 pub fn __cpp2rust_init_globals() {}