Va list binding compatibility

src/bindgen/ir/function.rs

@@ -239,10 +239,18 @@ impl SynFnArgHelpers for syn::FnArg {
             syn::FnArg::Typed(syn::PatType {
                 ref pat, ref ty, ..
             }) => {
+                let ty = match Type::load(ty)? {
+                    Some(x) => x,
+                    None => return Ok(None),
+                };
                 let name = match **pat {
                     syn::Pat::Wild(..) => None,
                     syn::Pat::Ident(syn::PatIdent { ref ident, .. }) => {
-                        Some(ident.unraw().to_string())
+                        if ty == Type::Primitive(super::PrimitiveType::VaList) {
+                            None
+                        } else {
+                            Some(ident.unraw().to_string())
+                        }
                     }
                     _ => {
                         return Err(format!(
@@ -251,10 +259,6 @@ impl SynFnArgHelpers for syn::FnArg {
                         ))
                     }
                 };
-                let ty = match Type::load(ty)? {
-                    Some(x) => x,
-                    None => return Ok(None),
-                };
                 if let Type::Array(..) = ty {
                     return Err("Array as function arguments are not supported".to_owned());
                 }

src/bindgen/ir/ty.rs

@@ -218,7 +218,7 @@ impl PrimitiveType {
             PrimitiveType::Float => "float",
             PrimitiveType::Double => "double",
             PrimitiveType::PtrDiffT => "ptrdiff_t",
-            PrimitiveType::VaList => "va_list",
+            PrimitiveType::VaList => "...",
         }
     }
 

tests/expectations/va_list.c

@@ -3,6 +3,25 @@
 #include <stdint.h>
 #include <stdlib.h>
 
-int32_t va_list_test(va_list ap);
+typedef int32_t (*VaListFnPtr)(int32_t count, ...);
 
-int32_t va_list_test2(va_list ap);
+typedef int32_t (*VaListFnPtr2)(int32_t count);
+
+typedef struct {
+  int32_t (*fn1)(int32_t count, ...);
+} Interface_______i32_______i32_______va_list;
+
+typedef struct {
+  int32_t (*fn1)(int32_t count);
+} Interface_______i32_______i32;
+
+int32_t va_list_test(int32_t count, ...);
+
+int32_t va_list_test2(int32_t count, ...);
+
+void va_list_fn_ptrs(int32_t (*fn1)(int32_t count, ...),
+                     int32_t (*fn2)(int32_t count),
+                     VaListFnPtr fn3,
+                     VaListFnPtr2 fn4,
+                     Interface_______i32_______i32_______va_list fn5,
+                     Interface_______i32_______i32 fn6);

tests/expectations/va_list.compat.c

@@ -3,13 +3,32 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+typedef int32_t (*VaListFnPtr)(int32_t count, ...);
+
+typedef int32_t (*VaListFnPtr2)(int32_t count);
+
+typedef struct {
+  int32_t (*fn1)(int32_t count, ...);
+} Interface_______i32_______i32_______va_list;
+
+typedef struct {
+  int32_t (*fn1)(int32_t count);
+} Interface_______i32_______i32;
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
 
-int32_t va_list_test(va_list ap);
+int32_t va_list_test(int32_t count, ...);
+
+int32_t va_list_test2(int32_t count, ...);
 
-int32_t va_list_test2(va_list ap);
+void va_list_fn_ptrs(int32_t (*fn1)(int32_t count, ...),
+                     int32_t (*fn2)(int32_t count),
+                     VaListFnPtr fn3,
+                     VaListFnPtr2 fn4,
+                     Interface_______i32_______i32_______va_list fn5,
+                     Interface_______i32_______i32 fn6);
 
 #ifdef __cplusplus
 }  // extern "C"

tests/expectations/va_list.cpp

@@ -4,10 +4,26 @@
 #include <ostream>
 #include <new>
 
+using VaListFnPtr = int32_t(*)(int32_t count, ...);
+
+using VaListFnPtr2 = int32_t(*)(int32_t count);
+
+template<typename T>
+struct Interface {
+  T fn1;
+};
+
 extern "C" {
 
-int32_t va_list_test(va_list ap);
+int32_t va_list_test(int32_t count, ...);
+
+int32_t va_list_test2(int32_t count, ...);
 
-int32_t va_list_test2(va_list ap);
+void va_list_fn_ptrs(int32_t (*fn1)(int32_t count, ...),
+                     int32_t (*fn2)(int32_t count),
+                     VaListFnPtr fn3,
+                     VaListFnPtr2 fn4,
+                     Interface<int32_t(*)(int32_t count, ...)> fn5,
+                     Interface<int32_t(*)(int32_t count)> fn6);
 
 }  // extern "C"

tests/expectations/va_list.pyx

@@ -6,6 +6,23 @@ cdef extern from *:
 
 cdef extern from *:
 
-  int32_t va_list_test(va_list ap);
+  ctypedef int32_t (*VaListFnPtr)(int32_t count, ...);
 
-  int32_t va_list_test2(va_list ap);
+  ctypedef int32_t (*VaListFnPtr2)(int32_t count);
+
+  ctypedef struct Interface_______i32_______i32_______va_list:
+    int32_t (*fn1)(int32_t count, ...);
+
+  ctypedef struct Interface_______i32_______i32:
+    int32_t (*fn1)(int32_t count);
+
+  int32_t va_list_test(int32_t count, ...);
+
+  int32_t va_list_test2(int32_t count, ...);
+
+  void va_list_fn_ptrs(int32_t (*fn1)(int32_t count, ...),
+                       int32_t (*fn2)(int32_t count),
+                       VaListFnPtr fn3,
+                       VaListFnPtr2 fn4,
+                       Interface_______i32_______i32_______va_list fn5,
+                       Interface_______i32_______i32 fn6);

tests/expectations/va_list_both.c

@@ -0,0 +1,27 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef int32_t (*VaListFnPtr)(int32_t count, ...);
+
+typedef int32_t (*VaListFnPtr2)(int32_t count);
+
+typedef struct Interface_______i32_______i32_______va_list {
+  int32_t (*fn1)(int32_t count, ...);
+} Interface_______i32_______i32_______va_list;
+
+typedef struct Interface_______i32_______i32 {
+  int32_t (*fn1)(int32_t count);
+} Interface_______i32_______i32;
+
+int32_t va_list_test(int32_t count, ...);
+
+int32_t va_list_test2(int32_t count, ...);
+
+void va_list_fn_ptrs(int32_t (*fn1)(int32_t count, ...),
+                     int32_t (*fn2)(int32_t count),
+                     VaListFnPtr fn3,
+                     VaListFnPtr2 fn4,
+                     struct Interface_______i32_______i32_______va_list fn5,
+                     struct Interface_______i32_______i32 fn6);

tests/expectations/va_list_both.compat.c

@@ -0,0 +1,35 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef int32_t (*VaListFnPtr)(int32_t count, ...);
+
+typedef int32_t (*VaListFnPtr2)(int32_t count);
+
+typedef struct Interface_______i32_______i32_______va_list {
+  int32_t (*fn1)(int32_t count, ...);
+} Interface_______i32_______i32_______va_list;
+
+typedef struct Interface_______i32_______i32 {
+  int32_t (*fn1)(int32_t count);
+} Interface_______i32_______i32;
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+int32_t va_list_test(int32_t count, ...);
+
+int32_t va_list_test2(int32_t count, ...);
+
+void va_list_fn_ptrs(int32_t (*fn1)(int32_t count, ...),
+                     int32_t (*fn2)(int32_t count),
+                     VaListFnPtr fn3,
+                     VaListFnPtr2 fn4,
+                     struct Interface_______i32_______i32_______va_list fn5,
+                     struct Interface_______i32_______i32 fn6);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus

tests/expectations/va_list_tag.c

@@ -0,0 +1,27 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef int32_t (*VaListFnPtr)(int32_t count, ...);
+
+typedef int32_t (*VaListFnPtr2)(int32_t count);
+
+struct Interface_______i32_______i32_______va_list {
+  int32_t (*fn1)(int32_t count, ...);
+};
+
+struct Interface_______i32_______i32 {
+  int32_t (*fn1)(int32_t count);
+};
+
+int32_t va_list_test(int32_t count, ...);
+
+int32_t va_list_test2(int32_t count, ...);
+
+void va_list_fn_ptrs(int32_t (*fn1)(int32_t count, ...),
+                     int32_t (*fn2)(int32_t count),
+                     VaListFnPtr fn3,
+                     VaListFnPtr2 fn4,
+                     struct Interface_______i32_______i32_______va_list fn5,
+                     struct Interface_______i32_______i32 fn6);

tests/expectations/va_list_tag.compat.c

@@ -0,0 +1,35 @@
+#include <stdarg.h>
+#include <stdbool.h>
+#include <stdint.h>
+#include <stdlib.h>
+
+typedef int32_t (*VaListFnPtr)(int32_t count, ...);
+
+typedef int32_t (*VaListFnPtr2)(int32_t count);
+
+struct Interface_______i32_______i32_______va_list {
+  int32_t (*fn1)(int32_t count, ...);
+};
+
+struct Interface_______i32_______i32 {
+  int32_t (*fn1)(int32_t count);
+};
+
+#ifdef __cplusplus
+extern "C" {
+#endif // __cplusplus
+
+int32_t va_list_test(int32_t count, ...);
+
+int32_t va_list_test2(int32_t count, ...);
+
+void va_list_fn_ptrs(int32_t (*fn1)(int32_t count, ...),
+                     int32_t (*fn2)(int32_t count),
+                     VaListFnPtr fn3,
+                     VaListFnPtr2 fn4,
+                     struct Interface_______i32_______i32_______va_list fn5,
+                     struct Interface_______i32_______i32 fn6);
+
+#ifdef __cplusplus
+}  // extern "C"
+#endif  // __cplusplus

tests/expectations/va_list_tag.pyx

@@ -0,0 +1,28 @@
+from libc.stdint cimport int8_t, int16_t, int32_t, int64_t, intptr_t
+from libc.stdint cimport uint8_t, uint16_t, uint32_t, uint64_t, uintptr_t
+cdef extern from *:
+  ctypedef bint bool
+  ctypedef struct va_list
+
+cdef extern from *:
+
+  ctypedef int32_t (*VaListFnPtr)(int32_t count, ...);
+
+  ctypedef int32_t (*VaListFnPtr2)(int32_t count);
+
+  cdef struct Interface_______i32_______i32_______va_list:
+    int32_t (*fn1)(int32_t count, ...);
+
+  cdef struct Interface_______i32_______i32:
+    int32_t (*fn1)(int32_t count);
+
+  int32_t va_list_test(int32_t count, ...);
+
+  int32_t va_list_test2(int32_t count, ...);
+
+  void va_list_fn_ptrs(int32_t (*fn1)(int32_t count, ...),
+                       int32_t (*fn2)(int32_t count),
+                       VaListFnPtr fn3,
+                       VaListFnPtr2 fn4,
+                       Interface_______i32_______i32_______va_list fn5,
+                       Interface_______i32_______i32 fn6);

tests/rust/va_list.rs

@@ -1,11 +1,30 @@
 use std::ffi::VaList;
 
 #[no_mangle]
-pub unsafe extern "C" fn va_list_test(mut ap: VaList) -> int32_t {
+pub unsafe extern "C" fn va_list_test(count: int32_t, mut ap: VaList) -> int32_t {
     ap.arg()
 }
 
 #[no_mangle]
-pub unsafe extern "C" fn va_list_test2(mut ap: ...) -> int32_t {
+pub unsafe extern "C" fn va_list_test2(count: int32_t, mut ap: ...) -> int32_t {
     ap.arg()
 }
+
+type VaListFnPtr = Option<unsafe extern "C" fn(count: int32_t, VaList) -> int32_t>;
+type VaListFnPtr2 = Option<unsafe extern "C" fn(count: int32_t, ...) -> int32_t>;
+
+#[repr(C)]
+struct Interface<T> {
+    fn1: T,
+}
+
+#[no_mangle]
+pub extern "C" fn va_list_fn_ptrs(
+    fn1: Option<unsafe extern "C" fn(count: int32_t, VaList) -> int32_t>,
+    fn2: Option<unsafe extern "C" fn(count: int32_t, ...) -> int32_t>,
+    fn3: VaListFnPtr,
+    fn4: VaListFnPtr2,
+    fn5: Interface<Option<unsafe extern "C" fn(count: int32_t, VaList) -> int32_t>>,
+    fn6: Interface<Option<unsafe extern "C" fn(count: int32_t, ...) -> int32_t>>,
+) {
+}