diff options
| author | Arthur Cohen <arthur.cohen@embecosm.com> | 2025-04-09 14:48:55 +0200 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2025-04-14 12:35:00 +0000 |
| commit | 5bd41f967706556524cd1de172d03e7351402405 (patch) | |
| tree | f6ae51e37b3f3a2ffdbbfaa62814f32d9a54e738 | |
| parent | 43b413664f9a482eb9cb44d2842d613c2a0a4b69 (diff) | |
| download | gcc-5bd41f967706556524cd1de172d03e7351402405.zip gcc-5bd41f967706556524cd1de172d03e7351402405.tar.gz gcc-5bd41f967706556524cd1de172d03e7351402405.tar.bz2 | |
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.
| -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 d5f85b7..ef13aea 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 () |