ctest: add tests for field size, offset, and field ptr #4561
Conversation
mbyx
force-pushed
the
ctest-field-test
branch
2 times, most recently
from
b3008cb to
8996f9b
Compare
|
It's fine to review the field ptr checks now, splitting it would be harder. |
ctest-next/src/template.rs
Outdated
| pub(crate) fn translate_signature_returning_ptr( | ||
| &self, | ||
| signature: &str, | ||
| return_type: &syn::Type, | ||
| ) -> Result<String, TranslationError> { |
There was a problem hiding this comment.
This can be a general cdecl generator right, not specific to signatures anymore right? Maybe translate_signature_returning_ptr -> make_cdecl, signature -> name, and return_type -> ty.
ctest-next/src/template.rs
Outdated
| if let syn::PathArguments::AngleBracketed(args) = &last.arguments { | ||
| if let syn::GenericArgument::Type(inner_ty) = args.args.first().unwrap() { | ||
| // Option<T> is ONLY ffi-safe if it contains a function pointer, or a reference. | ||
| match inner_ty { | ||
| syn::Type::Reference(_) | syn::Type::BareFn(_) => { | ||
| return self.translate_signature_returning_ptr(signature, inner_ty); | ||
| } | ||
| _ => { | ||
| return Err(TranslationError::new( | ||
| TranslationErrorKind::NotFfiCompatible, | ||
| &p.to_token_stream().to_string(), | ||
| inner_ty.span(), | ||
| )); | ||
| } | ||
| } | ||
| } | ||
| } |
There was a problem hiding this comment.
There is some similar logic for handling Option elsewhere isn't there? Could this reuse the valid type checks?
There was a problem hiding this comment.
It was duplicated in the previous PR, but not anymore.
ctest-next/src/template.rs
Outdated
| return Ok(format!("{elem_type} (*{signature})[{len_outer}]")); | ||
| } | ||
| } | ||
| _ => (), |
There was a problem hiding this comment.
Should unknown types return an error?
| @@ -291,4 +458,139 @@ impl<'a> TranslateHelper<'a> { | |||
|
|
|||
| Ok(self.generator.map(item)) | |||
| } | |||
|
|
|||
There was a problem hiding this comment.
All of the below functions are related to translating more complex Rust types to C types, not directly related to filling out the template. Could they be in the translator module, possibly as methods on Translator?
There was a problem hiding this comment.
basic_c_type and make_cdecl require ffi_items and generator, so I think it would be better to keep them here. translate_signature_partial depends on basic_c_type as well.
|
|
||
| let uninit_ty = MaybeUninit::<{{ item.id }}>::zeroed(); | ||
| let ty_ptr = uninit_ty.as_ptr(); | ||
| // SAFETY: We don't read `field_ptr`, only compare the pointer itself. |
There was a problem hiding this comment.
| // SAFETY: We don't read `field_ptr`, only compare the pointer itself. | |
| // SAFETY: We don't read `field_ptr`, only compare the pointer itself. The assumption is made that | |
| // this does not wrap the address space. |
Learned there is another precondition here
mbyx
force-pushed
the
ctest-field-test
branch
4 times, most recently
from
9b70c53 to
10163a4
Compare
Description
Adds tests for checking if the size and offset of a field is the same in Rust and C, as well as the pointer to that field.
Sources
Checklist
libc-test/semverhave been updated*LASTor*MAXareincluded (see #3131)
cd libc-test && cargo test --target mytarget);especially relevant for platforms that may not be checked in CI