diff options
| author | Owen Avery <powerboat9.gamer@gmail.com> | 2024-10-27 15:55:48 -0400 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2024-10-28 08:21:55 +0000 |
| commit | f9f690f500da1a8ae712ce9bcba4986b1c6e7206 (patch) | |
| tree | 38b13a7c5d1696f0669f65a6d3fd10c86dd7c06b /gcc | |
| parent | 549fe6d3a01109f6189b1bda9fd4478051062810 (diff) | |
| download | gcc-f9f690f500da1a8ae712ce9bcba4986b1c6e7206.zip gcc-f9f690f500da1a8ae712ce9bcba4986b1c6e7206.tar.gz gcc-f9f690f500da1a8ae712ce9bcba4986b1c6e7206.tar.bz2 | |
Use name resolution 2.0 in TraitItemReference
gcc/rust/ChangeLog:
* typecheck/rust-hir-type-check.cc: Add includes.
(TraitItemReference::get_type_from_fn): Use
ForeverStack::to_canonical_path when name resolution 2.0 is
enabled.
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/typecheck/rust-hir-type-check.cc | 23 |
1 files changed, 21 insertions, 2 deletions
diff --git a/gcc/rust/typecheck/rust-hir-type-check.cc b/gcc/rust/typecheck/rust-hir-type-check.cc index 129576f7..99d1dba 100644 --- a/gcc/rust/typecheck/rust-hir-type-check.cc +++ b/gcc/rust/typecheck/rust-hir-type-check.cc @@ -23,6 +23,10 @@ #include "rust-hir-type-check-item.h" #include "rust-hir-type-check-pattern.h" #include "rust-hir-type-check-struct-field.h" +#include "rust-immutable-name-resolution-context.h" + +// for flag_name_resolution_2_0 +#include "options.h" extern bool saw_errors (void); @@ -299,8 +303,23 @@ TraitItemReference::get_type_from_fn (/*const*/ HIR::TraitItemFunc &fn) const } auto &mappings = Analysis::Mappings::get (); - auto canonical_path - = mappings.lookup_canonical_path (fn.get_mappings ().get_nodeid ()); + + tl::optional<CanonicalPath> canonical_path; + if (flag_name_resolution_2_0) + { + auto &nr_ctx + = Resolver2_0::ImmutableNameResolutionContext::get ().resolver (); + + canonical_path + = nr_ctx.values.to_canonical_path (fn.get_mappings ().get_nodeid ()); + } + else + { + canonical_path + = mappings.lookup_canonical_path (fn.get_mappings ().get_nodeid ()); + } + + rust_assert (canonical_path); RustIdent ident{*canonical_path, fn.get_locus ()}; auto resolved = new TyTy::FnType ( |