topjohnwu/cxx
1
0
Fork 0
mirror of https://github.com/topjohnwu/cxx.git synced 2025-02-24 01:52:27 +00:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Pass improper ctype references by void pointer

Browse Source
This commit is contained in:
David Tolnay 2020-11-02 16:13:34 -08:00
parent 7953a11d0c
commit 4cb9767a1d
No known key found for this signature in database
GPG Key ID: F9BA143B95FF6D82
1 changed files with 20 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
macro/src/expand.rs
View File

@ -287,6 +287,10 @@ fn expand_cxx_function_shim(efn: &ExternFn, types: &Types) -> TokenStream {
None => quote!(::cxx::private::RustVec::from_ref(#var)), None => quote!(::cxx::private::RustVec::from_ref(#var)),
Some(_) => quote!(::cxx::private::RustVec::from_mut(#var)), Some(_) => quote!(::cxx::private::RustVec::from_mut(#var)),
}, },
inner if types.is_considered_improper_ctype(inner) => match ty.mutability {
None => quote!(#var as *const #inner as *const ::std::ffi::c_void),
Some(_) => quote!(#var as *mut #inner as *mut ::std::ffi::c_void),
},
_ => quote!(#var), _ => quote!(#var),
}, },
Type::Str(_) => quote!(::cxx::private::RustStr::from(#var)), Type::Str(_) => quote!(::cxx::private::RustStr::from(#var)),
@ -376,6 +380,10 @@ fn expand_cxx_function_shim(efn: &ExternFn, types: &Types) -> TokenStream {
None => quote!(#call.as_vec()), None => quote!(#call.as_vec()),
Some(_) => quote!(#call.as_mut_vec()), Some(_) => quote!(#call.as_mut_vec()),
}, },
inner if types.is_considered_improper_ctype(inner) => {
let mutability = ty.mutability;
quote!(&#mutability *#call.cast())
}
_ => call, _ => call,
}, },
Type::Str(_) => quote!(#call.as_str()), Type::Str(_) => quote!(#call.as_str()),
@ -545,6 +553,10 @@ fn expand_rust_function_shim_impl(
None => quote!(#ident.as_vec()), None => quote!(#ident.as_vec()),
Some(_) => quote!(#ident.as_mut_vec()), Some(_) => quote!(#ident.as_mut_vec()),
}, },
inner if types.is_considered_improper_ctype(inner) => {
let mutability = ty.mutability;
quote!(&#mutability *#ident.cast())
}
_ => quote!(#ident), _ => quote!(#ident),
}, },
Type::Str(_) => quote!(#ident.as_str()), Type::Str(_) => quote!(#ident.as_str()),
@ -593,6 +605,10 @@ fn expand_rust_function_shim_impl(
None => Some(quote!(::cxx::private::RustVec::from_ref)), None => Some(quote!(::cxx::private::RustVec::from_ref)),
Some(_) => Some(quote!(::cxx::private::RustVec::from_mut)), Some(_) => Some(quote!(::cxx::private::RustVec::from_mut)),
}, },
inner if types.is_considered_improper_ctype(inner) => match ty.mutability {
None => Some(quote!((|v| v as *const #inner as *const ::std::ffi::c_void))),
Some(_) => Some(quote!((|v| v as *mut #inner as *mut ::std::ffi::c_void))),
},
_ => None, _ => None,
}, },
Type::Str(_) => Some(quote!(::cxx::private::RustStr::from)), Type::Str(_) => Some(quote!(::cxx::private::RustStr::from)),
@ -960,6 +976,10 @@ fn expand_extern_type(ty: &Type, types: &Types) -> TokenStream {
let inner = expand_extern_type(&ty.inner, types); let inner = expand_extern_type(&ty.inner, types);
quote!(&#mutability ::cxx::private::RustVec<#inner>) quote!(&#mutability ::cxx::private::RustVec<#inner>)
} }
inner if types.is_considered_improper_ctype(inner) => match mutability {
None => quote!(*const ::std::ffi::c_void),
Some(_) => quote!(*#mutability ::std::ffi::c_void),
},
_ => quote!(#ty), _ => quote!(#ty),
} }
} }