Skip to content

test passing a VaList from rust to C #143397

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
62 changes: 51 additions & 11 deletions tests/run-make/c-link-to-rust-va-list-fn/checkrust.rs
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
#![crate_type = "staticlib"]
#![feature(c_variadic)]
#![feature(cfg_select)]

use std::ffi::{CStr, CString, VaList, c_char, c_double, c_int, c_long, c_longlong};
use std::ffi::{CStr, CString, VaList, VaListImpl, c_char, c_double, c_int, c_long, c_longlong};

macro_rules! continue_if {
($cond:expr) => {
Expand All @@ -19,15 +20,15 @@ unsafe fn compare_c_str(ptr: *const c_char, val: &str) -> bool {
}
}

#[no_mangle]
#[unsafe(no_mangle)]
pub unsafe extern "C" fn check_list_0(mut ap: VaList) -> usize {
continue_if!(ap.arg::<c_longlong>() == 1);
continue_if!(ap.arg::<c_int>() == 2);
continue_if!(ap.arg::<c_longlong>() == 3);
0
}

#[no_mangle]
#[unsafe(no_mangle)]
pub unsafe extern "C" fn check_list_1(mut ap: VaList) -> usize {
continue_if!(ap.arg::<c_int>() == -1);
continue_if!(ap.arg::<c_int>() == 'A' as c_int);
Expand All @@ -39,7 +40,7 @@ pub unsafe extern "C" fn check_list_1(mut ap: VaList) -> usize {
0
}

#[no_mangle]
#[unsafe(no_mangle)]
pub unsafe extern "C" fn check_list_2(mut ap: VaList) -> usize {
continue_if!(ap.arg::<c_double>().floor() == 3.14f64.floor());
continue_if!(ap.arg::<c_long>() == 12);
Expand All @@ -51,7 +52,7 @@ pub unsafe extern "C" fn check_list_2(mut ap: VaList) -> usize {
0
}

#[no_mangle]
#[unsafe(no_mangle)]
pub unsafe extern "C" fn check_list_copy_0(mut ap: VaList) -> usize {
continue_if!(ap.arg::<c_double>().floor() == 6.28f64.floor());
continue_if!(ap.arg::<c_int>() == 16);
Expand All @@ -64,14 +65,14 @@ pub unsafe extern "C" fn check_list_copy_0(mut ap: VaList) -> usize {
)
}

#[no_mangle]
#[unsafe(no_mangle)]
pub unsafe extern "C" fn check_varargs_0(_: c_int, mut ap: ...) -> usize {
continue_if!(ap.arg::<c_int>() == 42);
continue_if!(compare_c_str(ap.arg::<*const c_char>(), "Hello, World!"));
0
}

#[no_mangle]
#[unsafe(no_mangle)]
pub unsafe extern "C" fn check_varargs_1(_: c_int, mut ap: ...) -> usize {
continue_if!(ap.arg::<c_double>().floor() == 3.14f64.floor());
continue_if!(ap.arg::<c_long>() == 12);
Expand All @@ -80,12 +81,12 @@ pub unsafe extern "C" fn check_varargs_1(_: c_int, mut ap: ...) -> usize {
0
}

#[no_mangle]
#[unsafe(no_mangle)]
pub unsafe extern "C" fn check_varargs_2(_: c_int, _ap: ...) -> usize {
0
}

#[no_mangle]
#[unsafe(no_mangle)]
pub unsafe extern "C" fn check_varargs_3(_: c_int, mut ap: ...) -> usize {
continue_if!(ap.arg::<c_int>() == 1);
continue_if!(ap.arg::<c_int>() == 2);
Expand All @@ -100,7 +101,7 @@ pub unsafe extern "C" fn check_varargs_3(_: c_int, mut ap: ...) -> usize {
0
}

#[no_mangle]
#[unsafe(no_mangle)]
pub unsafe extern "C" fn check_varargs_4(_: c_double, mut ap: ...) -> usize {
continue_if!(ap.arg::<c_double>() == 1.0);
continue_if!(ap.arg::<c_double>() == 2.0);
Expand All @@ -118,7 +119,7 @@ pub unsafe extern "C" fn check_varargs_4(_: c_double, mut ap: ...) -> usize {
0
}

#[no_mangle]
#[unsafe(no_mangle)]
pub unsafe extern "C" fn check_varargs_5(_: c_int, mut ap: ...) -> usize {
continue_if!(ap.arg::<c_double>() == 1.0);
continue_if!(ap.arg::<c_int>() == 1);
Expand Down Expand Up @@ -148,3 +149,42 @@ pub unsafe extern "C" fn check_varargs_5(_: c_int, mut ap: ...) -> usize {
continue_if!(ap.arg::<c_double>() == 13.0);
0
}

unsafe extern "C" {
fn test_variadic(_: c_int, ...) -> usize;
fn test_va_list_by_value(_: VaList) -> usize;
fn test_va_list_by_pointer(_: *mut VaListImpl) -> usize;
fn test_va_list_by_pointer_pointer(_: *mut *mut VaListImpl) -> usize;
}

#[unsafe(no_mangle)]
extern "C" fn run_test_variadic() -> usize {
return unsafe { test_variadic(0, 1 as c_longlong, 2 as c_int, 3 as c_longlong) };
}

#[unsafe(no_mangle)]
extern "C" fn run_test_va_list_by_value() -> usize {
unsafe extern "C" fn helper(mut ap: ...) -> usize {
unsafe { test_va_list_by_value(ap.as_va_list()) }
}

unsafe { helper(1 as c_longlong, 2 as c_int, 3 as c_longlong) }
}

#[unsafe(no_mangle)]
extern "C" fn run_test_va_list_by_pointer() -> usize {
unsafe extern "C" fn helper(mut ap: ...) -> usize {
unsafe { test_va_list_by_pointer(&mut ap) }
}

unsafe { helper(1 as c_longlong, 2 as c_int, 3 as c_longlong) }
}

#[unsafe(no_mangle)]
extern "C" fn run_test_va_list_by_pointer_pointer() -> usize {
unsafe extern "C" fn helper(mut ap: ...) -> usize {
unsafe { test_va_list_by_pointer_pointer(&mut (&mut ap as *mut _)) }
}

unsafe { helper(1 as c_longlong, 2 as c_int, 3 as c_longlong) }
}
53 changes: 53 additions & 0 deletions tests/run-make/c-link-to-rust-va-list-fn/test.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,11 @@ extern size_t check_varargs_3(int fixed, ...);
extern size_t check_varargs_4(double fixed, ...);
extern size_t check_varargs_5(int fixed, ...);

extern size_t run_test_variadic();
extern size_t run_test_va_list_by_value();
extern size_t run_test_va_list_by_pointer();
extern size_t run_test_va_list_by_pointer_pointer();

int test_rust(size_t (*fn)(va_list), ...) {
size_t ret = 0;
va_list ap;
Expand Down Expand Up @@ -47,5 +52,53 @@ int main(int argc, char* argv[]) {
assert(check_varargs_5(0, 1.0, 1, 2.0, 2, 3.0, 3, 4.0, 4, 5, 5.0, 6, 6.0, 7, 7.0, 8, 8.0,
9, 9.0, 10, 10.0, 11, 11.0, 12, 12.0, 13, 13.0) == 0);

assert(run_test_variadic() == 0);
assert(run_test_va_list_by_value() == 0);
assert(run_test_va_list_by_pointer() == 0);
assert(run_test_va_list_by_pointer_pointer() == 0);

return 0;
}

#define continue_if_else_end(cond) \
do { if (!(cond)) { va_end(ap); return 0xff; } } while (0)

size_t test_variadic(int unused, ...) {
va_list ap;
va_start(ap, unused);

continue_if_else_end(va_arg(ap, long long) == 1);
continue_if_else_end(va_arg(ap, int) == 2);
continue_if_else_end(va_arg(ap, long long) == 3);

va_end(ap);

return 0;
}

#define continue_if(cond) \
do { if (!(cond)) { return 0xff; } } while (0)

size_t test_va_list_by_value(va_list ap) {
continue_if(va_arg(ap, long long) == 1);
continue_if(va_arg(ap, int) == 2);
continue_if(va_arg(ap, long long) == 3);

return 0;
}

size_t test_va_list_by_pointer(va_list *ap) {
continue_if(va_arg(*ap, long long) == 1);
continue_if(va_arg(*ap, int) == 2);
continue_if(va_arg(*ap, long long) == 3);

return 0;
}

size_t test_va_list_by_pointer_pointer(va_list **ap) {
continue_if(va_arg(**ap, long long) == 1);
continue_if(va_arg(**ap, int) == 2);
continue_if(va_arg(**ap, long long) == 3);

return 0;
}
Loading