Improved test coverage of va_list

mozilla · May 27, 2024 · 887da03 · 887da03
1 parent 822bde0
commit 887da03
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 0 deletions.
diff --git a/tests/expectations/va_list.c b/tests/expectations/va_list.c
@@ -3,6 +3,15 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+typedef int32_t (*VaListFnPtr)(va_list);
+
+typedef int32_t (*VaListFnPtr2)(va_list);
+
 int32_t va_list_test(va_list ap);
 
 int32_t va_list_test2(va_list ap);
+
+void va_list_fn_ptrs(int32_t (*ptr1)(va_list),
+                     int32_t (*ptr2)(va_list),
+                     VaListFnPtr ptr3,
+                     VaListFnPtr2 ptr4);
diff --git a/tests/expectations/va_list.compat.c b/tests/expectations/va_list.compat.c
@@ -3,6 +3,10 @@
 #include <stdint.h>
 #include <stdlib.h>
 
+typedef int32_t (*VaListFnPtr)(va_list);
+
+typedef int32_t (*VaListFnPtr2)(va_list);
+
 #ifdef __cplusplus
 extern "C" {
 #endif // __cplusplus
@@ -11,6 +15,11 @@ int32_t va_list_test(va_list ap);
 
 int32_t va_list_test2(va_list ap);
 
+void va_list_fn_ptrs(int32_t (*ptr1)(va_list),
+                     int32_t (*ptr2)(va_list),
+                     VaListFnPtr ptr3,
+                     VaListFnPtr2 ptr4);
+
 #ifdef __cplusplus
 }  // extern "C"
 #endif  // __cplusplus
diff --git a/tests/expectations/va_list.cpp b/tests/expectations/va_list.cpp
@@ -4,10 +4,19 @@
 #include <ostream>
 #include <new>
 
+using VaListFnPtr = int32_t(*)(va_list);
+
+using VaListFnPtr2 = int32_t(*)(va_list);
+
 extern "C" {
 
 int32_t va_list_test(va_list ap);
 
 int32_t va_list_test2(va_list ap);
 
+void va_list_fn_ptrs(int32_t (*ptr1)(va_list),
+                     int32_t (*ptr2)(va_list),
+                     VaListFnPtr ptr3,
+                     VaListFnPtr2 ptr4);
+
 }  // extern "C"
diff --git a/tests/expectations/va_list.pyx b/tests/expectations/va_list.pyx
@@ -6,6 +6,15 @@ cdef extern from *:
 
 cdef extern from *:
 
+  ctypedef int32_t (*VaListFnPtr)(va_list);
+
+  ctypedef int32_t (*VaListFnPtr2)(va_list);
+
   int32_t va_list_test(va_list ap);
 
   int32_t va_list_test2(va_list ap);
+
+  void va_list_fn_ptrs(int32_t (*ptr1)(va_list),
+                       int32_t (*ptr2)(va_list),
+                       VaListFnPtr ptr3,
+                       VaListFnPtr2 ptr4);
diff --git a/tests/rust/va_list.rs b/tests/rust/va_list.rs
@@ -9,3 +9,15 @@ pub unsafe extern "C" fn va_list_test(mut ap: VaList) -> int32_t {
 pub unsafe extern "C" fn va_list_test2(mut ap: ...) -> int32_t {
     ap.arg()
 }
+
+type VaListFnPtr = Option<unsafe extern "C" fn(VaList) -> int32_t>;
+type VaListFnPtr2 = Option<unsafe extern "C" fn(...) -> int32_t>;
+
+#[no_mangle]
+pub extern "C" fn va_list_fn_ptrs(
+    ptr1: Option<unsafe extern "C" fn(VaList) -> int32_t>,
+    ptr2: Option<unsafe extern "C" fn(...) -> int32_t>,
+    ptr3: VaListFnPtr,
+    ptr4: VaListFnPtr2,
+) {
+}