From 32fea09d30f2db75727be2e7dbd3b636cef5284c Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Patry Date: Tue, 29 Aug 2023 15:59:58 +0200 Subject: Retrieve def for derive & attribute proc macros Add definition retrieval for derive and attribute proc macro types. gcc/rust/ChangeLog: * resolve/rust-early-name-resolver-2.0.cc (Early::visit_attributes): Add proc macro handle retrieval for attribute and derive proc macros. Signed-off-by: Pierre-Emmanuel Patry --- gcc/rust/resolve/rust-early-name-resolver-2.0.cc | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'gcc') 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 7373e62..57a3807 100644 --- a/gcc/rust/resolve/rust-early-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-early-name-resolver-2.0.cc @@ -177,6 +177,8 @@ Early::visit (AST::UseTreeGlob &use) void Early::visit_attributes (std::vector &attrs) { + auto mappings = Analysis::Mappings::get (); + for (auto &attr : attrs) { auto name = attr.get_path ().get_segments ().at (0).get_segment_name (); @@ -192,7 +194,16 @@ Early::visit_attributes (std::vector &attrs) // FIXME: Change to proper error message rust_error_at (trait.get ().get_locus (), "could not resolve trait"); + continue; } + + auto pm_def + = mappings->lookup_derive_proc_macro_def (definition.value ()); + + rust_assert (pm_def.has_value ()); + + mappings->insert_derive_proc_macro_invocation (trait, + pm_def.value ()); } } else if (Analysis::BuiltinAttributeMappings::get () @@ -207,6 +218,13 @@ Early::visit_attributes (std::vector &attrs) "could not resolve attribute macro invocation"); return; } + auto pm_def + = mappings->lookup_attribute_proc_macro_def (definition.value ()); + + rust_assert (pm_def.has_value ()); + + mappings->insert_attribute_proc_macro_invocation (attr.get_path (), + pm_def.value ()); } } } -- cgit v1.1