From: Qingsong Chen changxian.cqs@antgroup.com
commit 3fa7187eceee11998f756481e45ce8c4f9d9dc48 upstream.
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: b44becc5ee80 ("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.co... Signed-off-by: Miguel Ojeda ojeda@kernel.org Signed-off-by: Greg Kroah-Hartman gregkh@linuxfoundation.org --- rust/macros/vtable.rs | 1 + 1 file changed, 1 insertion(+)
diff --git a/rust/macros/vtable.rs b/rust/macros/vtable.rs index 34d5e7fb5768..ee06044fcd4f 100644 --- a/rust/macros/vtable.rs +++ b/rust/macros/vtable.rs @@ -74,6 +74,7 @@ pub(crate) fn vtable(_attr: TokenStream, ts: TokenStream) -> TokenStream { const {gen_const_name}: bool = false;", ) .unwrap(); + consts.insert(gen_const_name); } } else { const_items = "const USE_VTABLE_ATTR: () = ();".to_owned();