From 5540afbd0136a6e78710445a89eb4af44fd14292 Mon Sep 17 00:00:00 2001 From: Pierre-Emmanuel Patry Date: Wed, 7 Feb 2024 12:51:28 +0100 Subject: gccrs: Reinject Self parameter in new resolver The old resolver injected a Self generic parameter in order to help the trait solver. This is clearly sketchy at best and should be fixed in the future. gcc/rust/ChangeLog: * resolve/rust-toplevel-name-resolver-2.0.cc (TopLevel::visit): Add Self generic parameter injection and a warning. * resolve/rust-toplevel-name-resolver-2.0.h: Add function prototype. Signed-off-by: Pierre-Emmanuel Patry --- .../resolve/rust-toplevel-name-resolver-2.0.cc | 23 ++++++++++++++++++++++ 1 file changed, 23 insertions(+) (limited to 'gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc') diff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc index f65ec77..80b1426 100644 --- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc @@ -186,6 +186,29 @@ TopLevel::visit (AST::Module &module) Analysis::Mappings::get ()->insert_ast_module (&module); } +void +TopLevel::visit (AST::Trait &trait) +{ + // FIXME: This Self injection is dodgy. It even lead to issues with metadata + // export in the past (#2349). We cannot tell appart injected parameters from + // regular ones. Dumping generic parameters highlights this Self in metadata, + // during debug or proc macro collection. This is clearly a hack. + // + // For now I'll keep it here in the new name resolver even if it should + // probably not be there. We need to find another way to solve this. + // Maybe an additional attribute to Trait ? + // + // From old resolver: + //// we need to inject an implicit self TypeParam here + //// FIXME: which location should be used for Rust::Identifier `Self`? + AST::TypeParam *implicit_self + = new AST::TypeParam ({"Self"}, trait.get_locus ()); + trait.insert_implict_self ( + std::unique_ptr (implicit_self)); + + DefaultResolver::visit (trait); +} + template static void insert_macros (std::vector ¯os, NameResolutionContext &ctx) -- cgit v1.1