ctest: add test for roundtripping structs/aliases/unions.

Author: mbyx

ctest-next/src/ast/field.rs

@@ -3,7 +3,6 @@ use crate::BoxStr;
 /// Represents a field in a struct or union defined in Rust.
 #[derive(Debug, Clone)]
 pub struct Field {
-    #[expect(unused)]
     pub(crate) public: bool,
     pub(crate) ident: BoxStr,
     pub(crate) ty: syn::Type,

ctest-next/src/ast/structure.rs

@@ -5,7 +5,6 @@ use crate::{BoxStr, Field};
 pub struct Struct {
     pub(crate) public: bool,
     pub(crate) ident: BoxStr,
-    #[expect(unused)]
     pub(crate) fields: Vec<Field>,
 }
 

ctest-next/src/ast/union.rs

@@ -6,7 +6,6 @@ pub struct Union {
     #[expect(unused)]
     pub(crate) public: bool,
     pub(crate) ident: BoxStr,
-    #[expect(unused)]
     pub(crate) fields: Vec<Field>,
 }
 

ctest-next/src/generator.rs

@@ -43,7 +43,7 @@ pub struct TestGenerator {
     volatile_items: Vec<VolatileItem>,
     array_arg: Option<ArrayArg>,
     skip_private: bool,
-    skip_roundtrip: Option<SkipTest>,
+    pub(crate) skip_roundtrip: Option<SkipTest>,
     pub(crate) skip_signededness: Option<SkipTest>,
 }
 

ctest-next/src/template.rs

@@ -3,7 +3,7 @@ use quote::ToTokens;
 
 use crate::ffi_items::FfiItems;
 use crate::translator::Translator;
-use crate::{BoxStr, MapInput, Result, TestGenerator, TranslationError};
+use crate::{BoxStr, Field, MapInput, Result, TestGenerator, TranslationError};
 
 /// Represents the Rust side of the generated testing suite.
 #[derive(Template, Clone)]
@@ -46,6 +46,7 @@ impl CTestTemplate {
 /// Stores all information necessary for generation of tests for all items.
 #[derive(Clone, Debug, Default)]
 pub(crate) struct TestTemplate {
+    pub roundtrip_tests: Vec<TestRoundtrip>,
     pub signededness_tests: Vec<TestSignededness>,
     pub size_align_tests: Vec<TestSizeAlign>,
     pub const_cstr_tests: Vec<TestCStr>,
@@ -69,6 +70,7 @@ impl TestTemplate {
         template.populate_const_and_cstr_tests(&helper)?;
         template.populate_size_align_tests(&helper)?;
         template.populate_signededness_tests(&helper)?;
+        template.populate_roundtrip_tests(&helper)?;
 
         Ok(template)
     }
@@ -180,6 +182,55 @@ impl TestTemplate {
 
         Ok(())
     }
+
+    /// Populates roundtrip tests for aliases/structs/unions.
+    ///
+    /// It also keeps track of the names of each test.
+    fn populate_roundtrip_tests(
+        &mut self,
+        helper: &TranslateHelper,
+    ) -> Result<(), TranslationError> {
+        for alias in helper.ffi_items.aliases() {
+            let c_ty = helper.c_type(alias)?;
+            self._add_roundtrip_test(helper, alias.ident(), &[], &c_ty, true);
+        }
+        for struct_ in helper.ffi_items.structs() {
+            let c_ty = helper.c_type(struct_)?;
+            self._add_roundtrip_test(helper, struct_.ident(), &struct_.fields, &c_ty, false);
+        }
+        for union_ in helper.ffi_items.unions() {
+            let c_ty = helper.c_type(union_)?;
+            self._add_roundtrip_test(helper, union_.ident(), &union_.fields, &c_ty, false);
+        }
+
+        Ok(())
+    }
+
+    fn _add_roundtrip_test(
+        &mut self,
+        helper: &TranslateHelper,
+        ident: &str,
+        fields: &[Field],
+        c_ty: &str,
+        is_alias: bool,
+    ) {
+        let should_skip_roundtrip_test = helper
+            .generator
+            .skip_roundtrip
+            .as_ref()
+            .is_some_and(|skip| skip(ident));
+        if !should_skip_roundtrip_test {
+            let item = TestRoundtrip {
+                test_name: roundtrip_test_ident(ident),
+                id: ident.into(),
+                fields: fields.iter().filter(|f| f.public).cloned().collect(),
+                c_ty: c_ty.into(),
+                is_alias,
+            };
+            self.roundtrip_tests.push(item.clone());
+            self.test_idents.push(item.test_name);
+        }
+    }
 }
 
 /* Many test structures have the following fields:
@@ -228,6 +279,15 @@ pub(crate) struct TestConst {
     pub c_ty: BoxStr,
 }
 
+#[derive(Clone, Debug)]
+pub(crate) struct TestRoundtrip {
+    pub test_name: BoxStr,
+    pub id: BoxStr,
+    pub fields: Vec<Field>,
+    pub c_ty: BoxStr,
+    pub is_alias: bool,
+}
+
 fn signededness_test_ident(ident: &str) -> BoxStr {
     format!("ctest_signededness_{ident}").into()
 }
@@ -244,6 +304,10 @@ fn const_test_ident(ident: &str) -> BoxStr {
     format!("ctest_const_{ident}").into()
 }
 
+fn roundtrip_test_ident(ident: &str) -> BoxStr {
+    format!("ctest_roundtrip_{ident}").into()
+}
+
 /// Wrap methods that depend on both ffi items and the generator.
 struct TranslateHelper<'a> {
     ffi_items: &'a FfiItems,

ctest-next/templates/test.c

@@ -53,3 +53,47 @@ uint32_t ctest_signededness_of__{{ alias.id }}(void) {
     return all_ones < 0;
 }
 {%- endfor +%}
+
+#ifdef _MSC_VER
+// Disable signed/unsigned conversion warnings on MSVC.
+// These trigger even if the conversion is explicit.
+#  pragma warning(disable:4365)
+#endif
+{%- for item in ctx.roundtrip_tests +%}
+
+// Tests whether the struct/union/alias `x` when passed by value to C and back to Rust
+// remains unchanged.
+// It checks if the size is the same as well as if the padding bytes are all in the correct place.
+{{ item.c_ty }} ctest_roundtrip__{{ item.id }}(
+    {{ item.c_ty }} value,
+    int* error,
+    uint8_t pad[sizeof({{ item.c_ty }})],
+    uint8_t expected_pad[sizeof({{ item.c_ty }})]
+) {
+    int size = (int)sizeof({{ item.c_ty }});
+    // Mark `p` as volatile so that the C compiler does not optimize away the pattern we create.
+    // Otherwise the Rust side would not be able to see it.
+    volatile uint8_t* p = (volatile uint8_t*)&value;
+    int i = 0;
+    for (i = 0; i < size; ++i) {
+        // We skip padding bytes in both Rust and C because writing to it is undefined.
+        // Instead we just make sure the the placement of the padding bytes remains the same.
+        if (pad[i]) { continue; }
+        uint8_t expected = (uint8_t)(i % 256);
+        expected = expected == 0? 42 : expected;
+        expected_pad[i] = expected;
+        // After we check that the pattern remained unchanged from Rust to C, we invert the pattern
+        // and send it back to Rust to make sure that it remains unchanged from C to Rust.
+        uint8_t d
+            = (uint8_t)(255) - (uint8_t)(i % 256);
+        d = d == 0? 42: d;
+        p[i] = d;
+    }
+    return value;
+}
+
+{%- endfor +%}
+
+#ifdef _MSC_VER
+#  pragma warning(default:4365)
+#endif

ctest-next/templates/test.rs

@@ -9,11 +9,14 @@
 mod generated_tests {
     #![allow(non_snake_case)]
     #![deny(improper_ctypes_definitions)]
-    use std::ffi::{CStr, c_char};
+    #[allow(unused_imports)]
+    use std::ffi::{CStr, c_int, c_char};
     use std::fmt::{Debug, LowerHex};
     use std::sync::atomic::{AtomicBool, AtomicUsize, Ordering};
     #[allow(unused_imports)]
     use std::{mem, ptr, slice};
+    #[allow(unused_imports)]
+    use std::mem::{MaybeUninit, offset_of};
 
     use super::*;
 
@@ -138,6 +141,122 @@ mod generated_tests {
         check_same((all_ones < all_zeros) as u32, c_is_signed, "{{ alias.id }} signed");
     }
 {%- endfor +%}
+
+{%- for item in ctx.roundtrip_tests +%}
+
+    /// Generates a padding map for a specific type.
+    ///
+    /// Essentially, it returns a list of bytes, whose length is equal to the size of the type in
+    /// bytes. Each element corresponds to a byte and has two values. `true` if the byte is padding,
+    /// and `false` if the byte is not padding.
+    ///
+    /// For aliases we assume that there are no padding bytes, for structs and unions,
+    /// if there are no fields, then everything is padding, if there are fields, then we have to
+    /// go through each field and figure out the padding.
+    fn roundtrip_padding__{{ item.id }}() -> Vec<bool> {
+        {%- if item.fields.len() == 0 +%}
+        // FIXME(ctest): What if it's an alias to a struct/union?
+        vec![!{{ item.is_alias }}; size_of::<{{ item.id }}>()]
+        {%- else +%}
+        let mut v = Vec::<(usize, usize)>::new();
+        let bar = MaybeUninit::<{{ item.id }}>::zeroed();
+        let bar = bar.as_ptr();
+        {%- for field in item.fields +%}
+
+        let ty_ptr = unsafe { &raw const ((*bar).{{ field.ident() }}) };
+        let val = unsafe { ty_ptr.read_unaligned() };
+
+        let size = size_of_val(&val);
+        let off = offset_of!({{ item.id }}, {{ field.ident() }});
+        v.push((off, size));
+        {%- endfor +%}
+         // This vector contains `true` if the byte is padding and `false` if the byte is not
+        // padding. Initialize all bytes as:
+        //  - padding if we have fields, this means that only the fields will be checked
+        //  - no-padding if we have a type alias: if this causes problems the type alias should
+        //    be skipped
+        let mut pad = vec![true; size_of::<{{ item.id }}>()];
+        for (off, size) in &v {
+            for i in 0..*size {
+                pad[off + i] = false;
+            }
+        }
+        pad
+        {%- endif +%}
+    }
+
+    /// Tests whether the type alias `x` when passed to C and back to Rust remains unchanged.
+    ///
+    /// It checks if the size is the same as well as if the padding bytes are all in the
+    /// correct place.
+    pub fn {{ item.test_name }}() {
+        type U = {{ item.id }};
+        extern "C" {
+            fn ctest_size_of__{{ item.id }}() -> u64;
+            fn ctest_roundtrip__{{ item.id }}(
+                x: MaybeUninit<U>, e: *mut c_int, pad: *const bool, expected: *mut u8
+            ) -> U;
+        }
+        let pad = roundtrip_padding__{{ item.id }}();
+        let mut error: c_int = 0;
+        let mut y = MaybeUninit::<U>::zeroed();
+        let mut x = MaybeUninit::<U>::zeroed();
+
+        let x_ptr = x.as_mut_ptr().cast::<u8>();
+        let y_ptr = y.as_mut_ptr().cast::<u8>();
+        let size = size_of::<U>();
+
+        // Fill the unitialized memory with a deterministic pattern.
+        // From Rust to C: every byte will be labelled from 1 to 255, with 0 turning into 42.
+        // From C to Rust: every byte will be inverted from before (254 -> 1), but 0 is still 42.
+        for i in 0..size {
+            let c: u8 = (i % 256) as u8;
+            let c = if c == 0 { 42 } else { c };
+            let d: u8 = 255_u8 - (i % 256) as u8;
+            let d = if d == 0 { 42 } else { d };
+            unsafe {
+                x_ptr.add(i).write_volatile(c);
+                y_ptr.add(i).write_volatile(d);
+            }
+        }
+
+        let c_size = unsafe { ctest_size_of__{{ item.id }}() } as usize;
+        if size != c_size {
+            FAILED.store(true, Ordering::Relaxed);
+            eprintln!(
+                "size of {{ item.c_ty }} is {c_size} in C and {size} in Rust\n",
+            );
+            return;
+        }
+
+        let mut expected = vec![0; size_of::<{{ item.id }}>()];
+        let r: U = unsafe {
+            ctest_roundtrip__{{ item.id }}(x, &mut error, pad.as_ptr(), expected.as_mut_ptr())
+        };
+
+        for (i, elem) in pad.iter().enumerate().take(size) {
+            if *elem { continue; }
+            let rust = unsafe { *x_ptr.add(i) };
+            let c = expected[i];
+            if rust != c {
+                eprintln!("rust[{}] = {} != {} (C): Rust \"{{ item.id }}\" -> C", i, rust, c);
+                FAILED.store(true, Ordering::Relaxed);
+            }
+        }
+
+        for (i, elem) in pad.iter().enumerate().take(size) {
+            if *elem { continue; }
+            let rust = unsafe { (*y_ptr.add(i)) as usize };
+            let c = unsafe { (&raw const r).cast::<u8>().add(i).read_volatile() as usize };
+            if rust != c {
+                eprintln!(
+                    "rust [{i}] = {rust} != {c} (C): C \"{{ item.id }}\" -> Rust",
+                );
+                FAILED.store(true, Ordering::Relaxed);
+            }
+        }
+    }
+{%- endfor +%}
 }
 
 use generated_tests::*;

ctest-next/tests/input/hierarchy.out.c

@@ -11,8 +11,7 @@ static bool ctest_const_ON_val_static = ON;
 
 // Define a function that returns a pointer to the value of the constant to test.
 // This will later be called on the Rust side via FFI.
-bool *ctest_const__ON(void)
-{
+bool *ctest_const__ON(void) {
     return &ctest_const_ON_val_static;
 }
 
@@ -24,8 +23,48 @@ uint64_t ctest_align_of__in6_addr(void) { return _Alignof(in6_addr); }
 
 // Return `1` if the type is signed, otherwise return `0`.
 // Casting -1 to the aliased type if signed evaluates to `-1 < 0`, if unsigned to `MAX_VALUE < 0`
-uint32_t ctest_signededness_of__in6_addr(void)
-{
-    in6_addr all_ones = (in6_addr)-1;
+uint32_t ctest_signededness_of__in6_addr(void) {
+    in6_addr all_ones = (in6_addr) -1;
     return all_ones < 0;
 }
+
+#ifdef _MSC_VER
+// Disable signed/unsigned conversion warnings on MSVC.
+// These trigger even if the conversion is explicit.
+#  pragma warning(disable:4365)
+#endif
+
+// Tests whether the struct/union/alias `x` when passed by value to C and back to Rust
+// remains unchanged.
+// It checks if the size is the same as well as if the padding bytes are all in the correct place.
+in6_addr ctest_roundtrip__in6_addr(
+    in6_addr value,
+    int* error,
+    uint8_t pad[sizeof(in6_addr)],
+    uint8_t expected_pad[sizeof(in6_addr)]
+) {
+    int size = (int)sizeof(in6_addr);
+    // Mark `p` as volatile so that the C compiler does not optimize away the pattern we create.
+    // Otherwise the Rust side would not be able to see it.
+    volatile uint8_t* p = (volatile uint8_t*)&value;
+    int i = 0;
+    for (i = 0; i < size; ++i) {
+        // We skip padding bytes in both Rust and C because writing to it is undefined.
+        // Instead we just make sure the the placement of the padding bytes remains the same.
+        if (pad[i]) { continue; }
+        uint8_t expected = (uint8_t)(i % 256);
+        expected = expected == 0? 42 : expected;
+        expected_pad[i] = expected;
+        // After we check that the pattern remained unchanged from Rust to C, we invert the pattern
+        // and send it back to Rust to make sure that it remains unchanged from C to Rust.
+        uint8_t d
+            = (uint8_t)(255) - (uint8_t)(i % 256);
+        d = d == 0? 42: d;
+        p[i] = d;
+    }
+    return value;
+}
+
+#ifdef _MSC_VER
+#  pragma warning(default:4365)
+#endif