From: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Date: Tue, 29 Aug 2023 13:59:58 +0000 (+0200)
Subject: gccrs: Retrieve def for derive & attribute proc macros
X-Git-Tag: basepoints/gcc-15~2143
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=91461d3e7335aecbdfc821acdbe48b8556434965;p=thirdparty%2Fgcc.git

gccrs: 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 <pierre-emmanuel.patry@embecosm.com>
---

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 7373e6232667..57a38078f144 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<AST::Attribute> &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<AST::Attribute> &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<AST::Attribute> &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 ());
 	}
     }
 }