From: Pierre-Emmanuel Patry Date: Mon, 6 Jan 2025 14:55:53 +0000 (+0100) Subject: gccrs: Resolved item type shall be differentiated later X-Git-Tag: basepoints/gcc-16~797 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=af1acc3599c0dcbc96b885bef81786a3d68b386a;p=thirdparty%2Fgcc.git gccrs: Resolved item type shall be differentiated later We need to query all namespaces and error out at a later stage if the retrieved item is wrong. gcc/rust/ChangeLog: * typecheck/rust-hir-trait-resolve.cc (TraitResolver::resolve_path_to_trait): Query all namespaces. Signed-off-by: Pierre-Emmanuel Patry --- diff --git a/gcc/rust/typecheck/rust-hir-trait-resolve.cc b/gcc/rust/typecheck/rust-hir-trait-resolve.cc index 82019328e16..04af5abf837 100644 --- a/gcc/rust/typecheck/rust-hir-trait-resolve.cc +++ b/gcc/rust/typecheck/rust-hir-trait-resolve.cc @@ -127,8 +127,10 @@ TraitResolver::resolve_path_to_trait (const HIR::TypePath &path, } else { - ok = resolver->lookup_resolved_type (path.get_mappings ().get_nodeid (), - &ref); + auto path_nodeid = path.get_mappings ().get_nodeid (); + ok = resolver->lookup_resolved_type (path_nodeid, &ref) + || resolver->lookup_resolved_name (path_nodeid, &ref) + || resolver->lookup_resolved_macro (path_nodeid, &ref); } if (!ok)