diff options
| author | Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> | 2023-08-29 16:41:55 +0200 |
|---|---|---|
| committer | P-E-P <32375388+P-E-P@users.noreply.github.com> | 2023-09-06 11:50:30 +0000 |
| commit | 9f7a9dfb26b84a5f6336e8e2e0c4a48e2de8fe80 (patch) | |
| tree | f863e18e7e1ee994dae1b644d6650a5956a2920e /gcc/rust | |
| parent | 32fea09d30f2db75727be2e7dbd3b636cef5284c (diff) | |
| download | gcc-9f7a9dfb26b84a5f6336e8e2e0c4a48e2de8fe80.zip gcc-9f7a9dfb26b84a5f6336e8e2e0c4a48e2de8fe80.tar.gz gcc-9f7a9dfb26b84a5f6336e8e2e0c4a48e2de8fe80.tar.bz2 | |
Change proc macro mapping definition insertion
Since the node id already is contained into the proc macro we may omit
it from the function arguments.
gcc/rust/ChangeLog:
* util/rust-hir-map.cc (Mappings::insert_derive_proc_macro_def):
Change the function body to fetch the node id from the macro
parameter.
(Mappings::insert_bang_proc_macro_def): Likewise.
(Mappings::insert_attribute_proc_macro_def): Likewise.
* util/rust-hir-map.h: Update the function's prototype by
removing the node id from the list of arguments.
Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Diffstat (limited to 'gcc/rust')
| -rw-r--r-- | gcc/rust/util/rust-hir-map.cc | 18 | ||||
| -rw-r--r-- | gcc/rust/util/rust-hir-map.h | 6 |
2 files changed, 12 insertions, 12 deletions
diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc index 20b9d93..84e805c 100644 --- a/gcc/rust/util/rust-hir-map.cc +++ b/gcc/rust/util/rust-hir-map.cc @@ -1003,30 +1003,30 @@ Mappings::lookup_attribute_proc_macros (CrateNum num) } void -Mappings::insert_derive_proc_macro_def (NodeId id, CustomDeriveProcMacro macro) +Mappings::insert_derive_proc_macro_def (CustomDeriveProcMacro macro) { - auto it = procmacroDeriveMappings.find (id); + auto it = procmacroDeriveMappings.find (macro.get_node_id ()); rust_assert (it == procmacroDeriveMappings.end ()); - procmacroDeriveMappings[id] = macro; + procmacroDeriveMappings[macro.get_node_id ()] = macro; } void -Mappings::insert_bang_proc_macro_def (NodeId id, BangProcMacro macro) +Mappings::insert_bang_proc_macro_def (BangProcMacro macro) { - auto it = procmacroBangMappings.find (id); + auto it = procmacroBangMappings.find (macro.get_node_id ()); rust_assert (it == procmacroBangMappings.end ()); - procmacroBangMappings[id] = macro; + procmacroBangMappings[macro.get_node_id ()] = macro; } void -Mappings::insert_attribute_proc_macro_def (NodeId id, AttributeProcMacro macro) +Mappings::insert_attribute_proc_macro_def (AttributeProcMacro macro) { - auto it = procmacroAttributeMappings.find (id); + auto it = procmacroAttributeMappings.find (macro.get_node_id ()); rust_assert (it == procmacroAttributeMappings.end ()); - procmacroAttributeMappings[id] = macro; + procmacroAttributeMappings[macro.get_node_id ()] = macro; } tl::optional<CustomDeriveProcMacro &> diff --git a/gcc/rust/util/rust-hir-map.h b/gcc/rust/util/rust-hir-map.h index 3e6b93f..ce91ccb 100644 --- a/gcc/rust/util/rust-hir-map.h +++ b/gcc/rust/util/rust-hir-map.h @@ -302,9 +302,9 @@ public: tl::optional<std::vector<AttributeProcMacro> &> lookup_attribute_proc_macros (CrateNum num); - void insert_derive_proc_macro_def (NodeId id, CustomDeriveProcMacro macro); - void insert_bang_proc_macro_def (NodeId id, BangProcMacro macro); - void insert_attribute_proc_macro_def (NodeId id, AttributeProcMacro macro); + void insert_derive_proc_macro_def (CustomDeriveProcMacro macro); + void insert_bang_proc_macro_def (BangProcMacro macro); + void insert_attribute_proc_macro_def (AttributeProcMacro macro); tl::optional<CustomDeriveProcMacro &> lookup_derive_proc_macro_def (NodeId id); |