diff options
| author | Arthur Cohen <arthur.cohen@embecosm.com> | 2025-04-09 14:48:55 +0200 |
|---|---|---|
| committer | Arthur Cohen <arthur.cohen@embecosm.com> | 2025-04-14 18:23:56 +0200 |
| commit | 9ed95c06977068cce86b5d35aee905533c757d57 (patch) | |
| tree | 184c98213d3ecc9dfdeddc746199c7dba36edfa5 /gcc | |
| parent | 34c516efbb8dce4bffe09045e6b941806744d1fd (diff) | |
| download | gcc-9ed95c06977068cce86b5d35aee905533c757d57.zip gcc-9ed95c06977068cce86b5d35aee905533c757d57.tar.gz gcc-9ed95c06977068cce86b5d35aee905533c757d57.tar.bz2 | |
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.
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/resolve/rust-early-name-resolver-2.0.cc | 7 |
1 files changed, 3 insertions, 4 deletions
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 afaca1f..36456e1 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 () |