From 02e3180d897fca68b7472fb72998cec3db4b5798 Mon Sep 17 00:00:00 2001 From: Owen Avery Date: Fri, 22 Aug 2025 22:57:05 -0400 Subject: [PATCH] nr1.0: Remove support in pattern checker gcc/rust/ChangeLog: * checks/errors/rust-hir-pattern-analysis.cc: Remove inclusion of "options.h". (PatternChecker::PatternChecker): Change initialization of resolver reference. (PatternChecker::visit): Assume name resolution 2.0 is enabled. * checks/errors/rust-hir-pattern-analysis.h: Include nr2.0 header instead of nr1.0 header. (PatternChecker::resolver): Change type to nr2.0 resolver. Signed-off-by: Owen Avery --- .../errors/rust-hir-pattern-analysis.cc | 19 ++++--------------- .../checks/errors/rust-hir-pattern-analysis.h | 4 ++-- 2 files changed, 6 insertions(+), 17 deletions(-) diff --git a/gcc/rust/checks/errors/rust-hir-pattern-analysis.cc b/gcc/rust/checks/errors/rust-hir-pattern-analysis.cc index 290087c573f1..13c54e34ccee 100644 --- a/gcc/rust/checks/errors/rust-hir-pattern-analysis.cc +++ b/gcc/rust/checks/errors/rust-hir-pattern-analysis.cc @@ -28,15 +28,12 @@ #include "rust-tyty.h" #include "rust-immutable-name-resolution-context.h" -// for flag_name_resolution_2_0 -#include "options.h" - namespace Rust { namespace Analysis { PatternChecker::PatternChecker () : tyctx (*Resolver::TypeCheckContext::get ()), - resolver (*Resolver::Resolver::get ()), + resolver (Resolver2_0::ImmutableNameResolutionContext::get ().resolver ()), mappings (Analysis::Mappings::get ()) {} @@ -238,17 +235,9 @@ PatternChecker::visit (CallExpr &expr) NodeId ast_node_id = expr.get_fnexpr ().get_mappings ().get_nodeid (); NodeId ref_node_id; - if (flag_name_resolution_2_0) - { - auto &nr_ctx - = Resolver2_0::ImmutableNameResolutionContext::get ().resolver (); - - if (auto id = nr_ctx.lookup (ast_node_id)) - ref_node_id = *id; - else - return; - } - else if (!resolver.lookup_resolved_name (ast_node_id, &ref_node_id)) + if (auto id = resolver.lookup (ast_node_id)) + ref_node_id = *id; + else return; if (auto definition_id = mappings.lookup_node_to_hir (ref_node_id)) diff --git a/gcc/rust/checks/errors/rust-hir-pattern-analysis.h b/gcc/rust/checks/errors/rust-hir-pattern-analysis.h index d75e900f2be4..645e61df751a 100644 --- a/gcc/rust/checks/errors/rust-hir-pattern-analysis.h +++ b/gcc/rust/checks/errors/rust-hir-pattern-analysis.h @@ -26,7 +26,7 @@ #include "rust-tyty.h" #include "optional.h" #include "rust-hir-visitor.h" -#include "rust-name-resolver.h" +#include "rust-immutable-name-resolution-context.h" namespace Rust { namespace Analysis { @@ -46,7 +46,7 @@ class PatternChecker : public HIR::HIRFullVisitor private: Resolver::TypeCheckContext &tyctx; - Resolver::Resolver &resolver; + const Resolver2_0::NameResolutionContext &resolver; Analysis::Mappings &mappings; virtual void visit (Lifetime &lifetime) override;