Skip to content

Commit 3fa7187

Browse files
cqs21ojeda
authored andcommitted
rust: macros: vtable: fix HAS_* redefinition (gen_const_name)
If we define the same function name twice in a trait (using `#[cfg]`), the `vtable` macro will redefine its `gen_const_name`, e.g. this will define `HAS_BAR` twice: #[vtable] pub trait Foo { #[cfg(CONFIG_X)] fn bar(); #[cfg(not(CONFIG_X))] fn bar(x: usize); } Fixes: b44becc ("rust: macros: add `#[vtable]` proc macro") Signed-off-by: Qingsong Chen <changxian.cqs@antgroup.com> Reviewed-by: Andreas Hindborg <a.hindborg@samsung.com> Reviewed-by: Gary Guo <gary@garyguo.net> Reviewed-by: Sergio González Collado <sergio.collado@gmail.com> Link: https://lore.kernel.org/r/20230808025404.2053471-1-changxian.cqs@antgroup.com Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
1 parent 52a93d3 commit 3fa7187

File tree

1 file changed

+1
-0
lines changed

1 file changed

+1
-0
lines changed

rust/macros/vtable.rs

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,6 +74,7 @@ pub(crate) fn vtable(_attr: TokenStream, ts: TokenStream) -> TokenStream {
7474
const {gen_const_name}: bool = false;",
7575
)
7676
.unwrap();
77+
consts.insert(gen_const_name);
7778
}
7879
} else {
7980
const_items = "const USE_VTABLE_ATTR: () = ();".to_owned();

0 commit comments

Comments
 (0)