]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
rust: macros: vtable: fix `HAS_*` redefinition (`gen_const_name`)
authorQingsong Chen <changxian.cqs@antgroup.com>
Tue, 8 Aug 2023 02:54:01 +0000 (10:54 +0800)
committerMiguel Ojeda <ojeda@kernel.org>
Wed, 9 Aug 2023 19:15:07 +0000 (21:15 +0200)
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>
rust/macros/vtable.rs

index 34d5e7fb5768a242f417c19345146cc1b6cfe638..ee06044fcd4f35cdb40be79c16d9c5b5995841a5 100644 (file)
@@ -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();