fixup check removal

Author: powerboat9

gcc/rust/checks/errors/rust-readonly-check.cc

@@ -33,7 +33,7 @@ namespace HIR {
 static std::set<HirId> already_assigned_variables = {};
 
 ReadonlyChecker::ReadonlyChecker ()
-  : resolver (*Resolver::Resolver::get ()),
+  : nr_ctx (Resolver2_0::ImmutableNameResolutionContext::get ().resolver ()),
     mappings (Analysis::Mappings::get ()),
     context (*Resolver::TypeCheckContext::get ())
 {}
@@ -63,8 +63,6 @@ ReadonlyChecker::visit (PathInExpression &expr)
   NodeId ast_node_id = expr.get_mappings ().get_nodeid ();
   NodeId def_id;
 
-  auto &nr_ctx
-    = Resolver2_0::ImmutableNameResolutionContext::get ().resolver ();
   if (auto id = nr_ctx.lookup (ast_node_id))
     def_id = *id;
   else

gcc/rust/checks/errors/rust-readonly-check.h

@@ -38,7 +38,7 @@ class ReadonlyChecker : public DefaultHIRVisitor
     decrement,
   };
 
-  Resolver::Resolver &resolver;
+  const Resolver2_0::NameResolutionContext &nr_ctx;
   Analysis::Mappings &mappings;
   Resolver::TypeCheckContext &context;
   StackedContexts<HirId> mutable_context;