Add more optional reference tests

Author: CAD97

tests/ffi/lib.rs

@@ -134,6 +134,8 @@ pub mod ffi {
         fn c_take_ref_c(c: &C);
         fn c_take_opt_ref_r(r: Option<&R>);
         fn c_take_opt_mut_r(r: Option<&mut R>);
+        fn c_take_opt_ref_c(r: Option<&C>);
+        fn c_take_opt_mut_c(r: Option<Pin<&mut C>>);
         fn c_take_str(s: &str);
         fn c_take_slice_char(s: &[c_char]);
         fn c_take_slice_shared(s: &[Shared]);

tests/ffi/module.rs

@@ -35,6 +35,10 @@ pub mod ffi2 {
         fn c_take_trivial_mut_ref(d: &mut D);
         fn c_take_trivial_pin_ref(d: Pin<&D>);
         fn c_take_trivial_pin_mut_ref(d: Pin<&mut D>);
+        fn c_take_trivial_opt_ref(d: Option<&D>);
+        fn c_take_trivial_opt_mut_ref(d: Option<&mut D>);
+        fn c_take_trivial_opt_pin_ref(d: Option<Pin<&D>>);
+        fn c_take_trivial_opt_pin_mut_ref(d: Option<Pin<&mut D>>);
         fn c_take_trivial_ref_method(self: &D);
         fn c_take_trivial_mut_ref_method(self: &mut D);
         fn c_take_trivial(d: D);

tests/ffi/tests.cc

@@ -289,6 +289,22 @@ void c_take_opt_mut_r(R *r) {
   }
 }
 
+void c_take_opt_ref_c(const C *c) {
+  if (c) {
+    c_take_ref_c(*c);
+  } else {
+    cxx_test_suite_set_correct();
+  }
+}
+
+void c_take_opt_mut_c(C *c) {
+  if (c) {
+    c_take_ref_c(*c);
+  } else {
+    cxx_test_suite_set_correct();
+  }
+}
+
 void c_take_ref_ns_c(const ::H::H &h) {
   if (h.h == "hello") {
     cxx_test_suite_set_correct();
@@ -640,6 +656,14 @@ void c_take_trivial_pin_ref(const D &d) { (void)d; }
 
 void c_take_trivial_pin_mut_ref(D &d) { (void)d; }
 
+void c_take_trivial_opt_ref(const D *d) { (void)d; }
+
+void c_take_trivial_opt_mut_ref(D *d) { (void)d; }
+
+void c_take_trivial_opt_pin_ref(const D *d) { (void)d; }
+
+void c_take_trivial_opt_pin_mut_ref(D *d) { (void)d; }
+
 void D::c_take_trivial_ref_method() const {
   if (d == 30) {
     cxx_test_suite_set_correct();

tests/ffi/tests.h

@@ -133,6 +133,8 @@ void c_take_ref_r(const R &r);
 void c_take_ref_c(const C &c);
 void c_take_opt_ref_r(const R *r);
 void c_take_opt_mut_r(R *r);
+void c_take_opt_ref_c(const C *c);
+void c_take_opt_mut_c(C *c);
 void c_take_ref_ns_c(const ::H::H &h);
 void c_take_str(rust::Str s);
 void c_take_slice_char(rust::Slice<const char> s);
@@ -193,6 +195,10 @@ void c_take_trivial_ref(const D &d);
 void c_take_trivial_mut_ref(D &d);
 void c_take_trivial_pin_ref(const D &d);
 void c_take_trivial_pin_mut_ref(D &d);
+void c_take_trivial_opt_ref(const D *d);
+void c_take_trivial_opt_mut_ref(D *d);
+void c_take_trivial_opt_pin_ref(const D *d);
+void c_take_trivial_opt_pin_mut_ref(D *d);
 void c_take_trivial(D d);
 
 void c_take_trivial_ns_ptr(std::unique_ptr<::G::G> g);