From: Arthur Cohen <arthur.cohen@embecosm.com>
Date: Wed, 9 Apr 2025 12:48:55 +0000 (+0200)
Subject: gccrs: nr2.0: Only insert derive macros if they exist
X-Git-Tag: basepoints/gcc-16~102
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9ed95c06977068cce86b5d35aee905533c757d57;p=thirdparty%2Fgcc.git

gccrs: nr2.0: Only insert derive macros if they exist

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.
---

diff --git a/gcc/rust/resolve/rust-early-name-resolver-2.0.cc b/gcc/rust/resolve/rust-early-name-resolver-2.0.cc
index afaca1f71f0..36456e10ff2 100644
--- a/gcc/rust/resolve/rust-early-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-early-name-resolver-2.0.cc
@@ -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 ()