Follow proper derive rules for function pointers.

4 files changed, 65 insertions, 3 deletions

diff --git a/tests/expectations/tests/call-conv-field.rs b/tests/expectations/tests/call-conv-field.rs
index e9a4d873..d6aa9e4e 100644
--- a/tests/expectations/tests/call-conv-field.rs
+++ b/tests/expectations/tests/call-conv-field.rs
@@ -5,17 +5,18 @@
 
 
 #[repr(C)]
-#[derive(Debug, Copy)]
+#[derive(Copy)]
 pub struct JNINativeInterface_ {
     pub GetVersion: ::std::option::Option<unsafe extern "stdcall" fn(env:
                                                                          *mut ::std::os::raw::c_void)
                                               -> ::std::os::raw::c_int>,
+    pub __hack: ::std::os::raw::c_ulonglong,
 }
 #[test]
 fn bindgen_test_layout_JNINativeInterface_() {
-    assert_eq!(::std::mem::size_of::<JNINativeInterface_>() , 4usize , concat
+    assert_eq!(::std::mem::size_of::<JNINativeInterface_>() , 16usize , concat
                ! ( "Size of: " , stringify ! ( JNINativeInterface_ ) ));
-    assert_eq! (::std::mem::align_of::<JNINativeInterface_>() , 4usize ,
+    assert_eq! (::std::mem::align_of::<JNINativeInterface_>() , 8usize ,
                 concat ! (
                 "Alignment of " , stringify ! ( JNINativeInterface_ ) ));
     assert_eq! (unsafe {
@@ -23,6 +24,11 @@ fn bindgen_test_layout_JNINativeInterface_() {
                 const _ as usize } , 0usize , concat ! (
                 "Alignment of field: " , stringify ! ( JNINativeInterface_ ) ,
                 "::" , stringify ! ( GetVersion ) ));
+    assert_eq! (unsafe {
+                & ( * ( 0 as * const JNINativeInterface_ ) ) . __hack as *
+                const _ as usize } , 8usize , concat ! (
+                "Alignment of field: " , stringify ! ( JNINativeInterface_ ) ,
+                "::" , stringify ! ( __hack ) ));
 }
 impl Clone for JNINativeInterface_ {
     fn clone(&self) -> Self { *self }
diff --git a/tests/expectations/tests/derive-fn-ptr.rs b/tests/expectations/tests/derive-fn-ptr.rs
new file mode 100644
index 00000000..b6a4f351
--- /dev/null
+++ b/tests/expectations/tests/derive-fn-ptr.rs
@@ -0,0 +1,46 @@
+/* automatically generated by rust-bindgen */
+
+
+#![allow(non_snake_case)]
+
+
+pub type my_fun_t =
+    ::std::option::Option<unsafe extern "C" fn(arg1: ::std::os::raw::c_int,
+                                               arg2: ::std::os::raw::c_int,
+                                               arg3: ::std::os::raw::c_int,
+                                               arg4: ::std::os::raw::c_int,
+                                               arg5: ::std::os::raw::c_int,
+                                               arg6: ::std::os::raw::c_int,
+                                               arg7: ::std::os::raw::c_int,
+                                               arg8: ::std::os::raw::c_int,
+                                               arg9: ::std::os::raw::c_int,
+                                               arg10: ::std::os::raw::c_int,
+                                               arg11: ::std::os::raw::c_int,
+                                               arg12: ::std::os::raw::c_int,
+                                               arg13: ::std::os::raw::c_int,
+                                               arg14: ::std::os::raw::c_int,
+                                               arg15: ::std::os::raw::c_int,
+                                               arg16: ::std::os::raw::c_int)>;
+#[repr(C)]
+#[derive(Copy)]
+pub struct Foo {
+    pub callback: my_fun_t,
+}
+#[test]
+fn bindgen_test_layout_Foo() {
+    assert_eq!(::std::mem::size_of::<Foo>() , 8usize , concat ! (
+               "Size of: " , stringify ! ( Foo ) ));
+    assert_eq! (::std::mem::align_of::<Foo>() , 8usize , concat ! (
+                "Alignment of " , stringify ! ( Foo ) ));
+    assert_eq! (unsafe {
+                & ( * ( 0 as * const Foo ) ) . callback as * const _ as usize
+                } , 0usize , concat ! (
+                "Alignment of field: " , stringify ! ( Foo ) , "::" ,
+                stringify ! ( callback ) ));
+}
+impl Clone for Foo {
+    fn clone(&self) -> Self { *self }
+}
+impl Default for Foo {
+    fn default() -> Self { unsafe { ::std::mem::zeroed() } }
+}
diff --git a/tests/headers/call-conv-field.h b/tests/headers/call-conv-field.h
index b6d306eb..5702a09a 100644
--- a/tests/headers/call-conv-field.h
+++ b/tests/headers/call-conv-field.h
@@ -2,6 +2,8 @@
 
 struct JNINativeInterface_ {
   int (__stdcall *GetVersion)(void *env);
+  unsigned long long __hack; // A hack so the field alignment is the same than
+                             // for 64-bit, where we run CI.
 };
 
 __stdcall void bar();
diff --git a/tests/headers/derive-fn-ptr.h b/tests/headers/derive-fn-ptr.h
new file mode 100644
index 00000000..39ff76d6
--- /dev/null
+++ b/tests/headers/derive-fn-ptr.h
@@ -0,0 +1,8 @@
+typedef void (*my_fun_t)(int, int, int, int,
+                         int, int, int, int,
+                         int, int, int, int,
+                         int, int, int, int);
+
+struct Foo {
+  my_fun_t callback;
+};