gccrs: 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>

diff --git a/gcc/rust/util/rust-hir-map.cc b/gcc/rust/util/rust-hir-map.cc
index 67d589cc2475488ae47114641ddb0860db1cd9a3..748b15b9afae911066032a75acf2d3eb45471348 100644 (file)
--- 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 85da280264072ea04696b4d4516558cefcadef68..a663bfe4a56175a3dd8624caf044dec9ef1ef59c 100644 (file)
--- 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);