summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorQingsong Chen <changxian.cqs@antgroup.com>2023-08-08 04:54:01 +0200
committerMiguel Ojeda <ojeda@kernel.org>2023-08-09 21:15:07 +0200
commit3fa7187eceee11998f756481e45ce8c4f9d9dc48 (patch)
tree55c80a68613912b2af3ea3c2e68394a4678f5572
parentLinux 6.5-rc5 (diff)
downloadlinux-3fa7187eceee11998f756481e45ce8c4f9d9dc48.tar.xz
linux-3fa7187eceee11998f756481e45ce8c4f9d9dc48.zip
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: 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.com Signed-off-by: Miguel Ojeda <ojeda@kernel.org>
-rw-r--r--rust/macros/vtable.rs1
1 files changed, 1 insertions, 0 deletions
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();