]> git.ipfire.org Git - thirdparty/gcc.git/commitdiff
gccrs: nr2.0: Only insert derive macros if they exist
authorArthur Cohen <arthur.cohen@embecosm.com>
Wed, 9 Apr 2025 12:48:55 +0000 (14:48 +0200)
committerArthur Cohen <arthur.cohen@embecosm.com>
Mon, 14 Apr 2025 16:23:56 +0000 (18:23 +0200)
This causes an assertion failure when compiling core with nr2.0, but should
probably be improved. I'm not sure how this code enables built-in derive
macros to be resolved so this is a temporary fix.

gcc/rust/ChangeLog:

* resolve/rust-early-name-resolver-2.0.cc (Early::visit_attributes): Remove assertion.

gcc/rust/resolve/rust-early-name-resolver-2.0.cc

index afaca1f71f03313a17ea704449d4994e08a82177..36456e10ff26fc3ad3e1443ae071967e0a5307e2 100644 (file)
@@ -325,10 +325,9 @@ Early::visit_attributes (std::vector<AST::Attribute> &attrs)
              auto pm_def = mappings.lookup_derive_proc_macro_def (
                definition->get_node_id ());
 
-             rust_assert (pm_def.has_value ());
-
-             mappings.insert_derive_proc_macro_invocation (trait,
-                                                           pm_def.value ());
+             if (pm_def.has_value ())
+               mappings.insert_derive_proc_macro_invocation (trait,
+                                                             pm_def.value ());
            }
        }
       else if (Analysis::BuiltinAttributeMappings::get ()