Skip to content
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.

Sign up for GitHub

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

Omit parameter names from internal vtable definitions #2808

Merged
merged 2 commits into from
Jan 19, 2024
Merged

Omit parameter names from internal vtable definitions #2808

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7b65e2c
vtable_named_params
kennykerr Jan 19, 2024
f4ca84d
code gen
kennykerr Jan 19, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
2 changes: 1 addition & 1 deletion crates/libs/bindgen/src/rust/delegates.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,7 @@ fn gen_win_delegate(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
let doc = writer.cfg_doc(&cfg);
let features = writer.cfg_features(&cfg);

let vtbl_signature = writer.vtbl_signature(def, generics, &signature);
let vtbl_signature = writer.vtbl_signature(def, true, &signature);
let invoke = winrt_methods::writer(writer, def, generics, metadata::InterfaceKind::Default, method, &mut MethodNames::new(), &mut MethodNames::new());
let invoke_upcall = winrt_methods::gen_upcall(writer, &signature, quote! { ((*this).invoke) });

Expand Down
2 changes: 1 addition & 1 deletion crates/libs/bindgen/src/rust/implements.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ pub fn writer(writer: &Writer, def: metadata::TypeDef) -> TokenStream {
let method_impls = def.methods().map(|method| {
let name = method_names.add(method);
let signature = metadata::method_def_signature(def.namespace(), method, generics);
let vtbl_signature = writer.vtbl_signature(def, generics, &signature);
let vtbl_signature = writer.vtbl_signature(def, true, &signature);

let invoke_upcall = if def.flags().contains(metadata::TypeAttributes::WindowsRuntime) { winrt_methods::gen_upcall(writer, &signature, quote! { this.#name }) } else { com_methods::gen_upcall(writer, &signature, quote! { this.#name }) };

Expand Down
72 changes: 58 additions & 14 deletions crates/libs/bindgen/src/rust/writer.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -789,7 +789,7 @@ impl Writer {
let name = method_names.add(method);
let signature = metadata::method_def_signature(def.namespace(), method, generics);
let mut cfg = cfg::signature_cfg(method);
let signature = self.vtbl_signature(def, generics, &signature);
let signature = self.vtbl_signature(def, false, &signature);
cfg.add_feature(def.namespace());
let cfg_all = self.cfg_features(&cfg);
let cfg_not = self.cfg_not_features(&cfg);
Expand All @@ -816,7 +816,7 @@ impl Writer {
}
}
}
pub fn vtbl_signature(&self, def: metadata::TypeDef, _generics: &[metadata::Type], signature: &metadata::Signature) -> TokenStream {
pub fn vtbl_signature(&self, def: metadata::TypeDef, named_params: bool, signature: &metadata::Signature) -> TokenStream {
let is_winrt = def.flags().contains(metadata::TypeAttributes::WindowsRuntime);

let crate_name = self.crate_name();
Expand All @@ -826,15 +826,27 @@ impl Writer {
metadata::Type::Void => (quote! {}, quote! {}, quote! {}),
metadata::Type::WinrtArray(kind) => {
let tokens = self.type_abi_name(kind);
(quote! { result_size__: *mut u32, result__: *mut *mut #tokens }, quote! { -> #crate_name HRESULT }, quote! {})
if named_params {
(quote! { result_size__: *mut u32, result__: *mut *mut #tokens }, quote! { -> #crate_name HRESULT }, quote! {})
} else {
(quote! { *mut u32, *mut *mut #tokens }, quote! { -> #crate_name HRESULT }, quote! {})
}
}
_ if is_winrt => {
let tokens = self.type_abi_name(&signature.return_type);
(quote! { result__: *mut #tokens }, quote! { -> #crate_name HRESULT }, quote! {})
if named_params {
(quote! { result__: *mut #tokens }, quote! { -> #crate_name HRESULT }, quote! {})
} else {
(quote! { *mut #tokens }, quote! { -> #crate_name HRESULT }, quote! {})
}
}
_ if metadata::type_is_struct(&signature.return_type) => {
let tokens = self.type_abi_name(&signature.return_type);
(quote! {}, quote! {}, quote! { result__: *mut #tokens, })
if named_params {
(quote! {}, quote! {}, quote! { result__: *mut #tokens, })
} else {
(quote! {}, quote! {}, quote! { *mut #tokens, })
}
}
_ => {
let tokens = self.type_default_name(&signature.return_type);
Expand All @@ -850,34 +862,66 @@ impl Writer {

if p.def.flags().contains(metadata::ParamAttributes::In) {
if p.ty.is_winrt_array() {
quote! { #abi_size_name: u32, #name: *const #abi, }
if named_params {
quote! { #abi_size_name: u32, #name: *const #abi, }
} else {
quote! { u32, *const #abi, }
}
} else if p.ty.is_const_ref() {
quote! { #name: &#abi, }
} else {
if named_params {
quote! { #name: &#abi, }
} else {
quote! { &#abi, }
}
} else if named_params {
quote! { #name: #abi, }
} else {
quote! { #abi, }
}
} else if p.ty.is_winrt_array() {
quote! { #abi_size_name: u32, #name: *mut #abi, }
if named_params {
quote! { #abi_size_name: u32, #name: *mut #abi, }
} else {
quote! { u32, *mut #abi, }
}
} else if p.ty.is_winrt_array_ref() {
quote! { #abi_size_name: *mut u32, #name: *mut *mut #abi, }
} else {
if named_params {
quote! { #abi_size_name: *mut u32, #name: *mut *mut #abi, }
} else {
quote! { *mut u32, *mut *mut #abi, }
}
} else if named_params {
quote! { #name: *mut #abi, }
} else {
quote! { *mut #abi, }
}
} else {
match p.kind {
metadata::SignatureParamKind::ValueType => {
let abi = self.type_default_name(&p.ty);
quote! { #name: #abi, }
if named_params {
quote! { #name: #abi, }
} else {
quote! { #abi, }
}
}
_ => {
let abi = self.type_abi_name(&p.ty);
quote! { #name: #abi, }
if named_params {
quote! { #name: #abi, }
} else {
quote! { #abi, }
}
}
}
}
});

quote! { (this: *mut ::core::ffi::c_void, #udt_return_type #(#params)* #trailing_return_type) #return_type }
if named_params {
quote! { (this: *mut ::core::ffi::c_void, #udt_return_type #(#params)* #trailing_return_type) #return_type }
} else {
quote! { (*mut ::core::ffi::c_void, #udt_return_type #(#params)* #trailing_return_type) #return_type }
}
}
pub fn param_name(&self, param: metadata::Param) -> TokenStream {
// In Rust, function parameters cannot be named the same as structs. This avoids some collisions that occur in the win32 metadata.
Expand Down
Loading