From 73c1ddd8d263d84d209db0b4c72ce9916135ed67 Mon Sep 17 00:00:00 2001
From: Owen Avery <powerboat9.gamer@gmail.com>
Date: Tue, 15 Oct 2024 15:33:46 -0400
Subject: [PATCH] Use name resolver 2.0 in const checker

gcc/rust/ChangeLog:

	* checks/errors/rust-const-checker.cc: Add includes.
	(ConstChecker::visit): Use name resolver 2.0 to lookup
	function definitions when name resolution 2.0 is enabled.

gcc/testsuite/ChangeLog:

	* rust/compile/nr2/exclude: Remove entries.

Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
---
 gcc/rust/checks/errors/rust-const-checker.cc | 16 +++++++++++++++-
 gcc/testsuite/rust/compile/nr2/exclude       |  3 ---
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/gcc/rust/checks/errors/rust-const-checker.cc b/gcc/rust/checks/errors/rust-const-checker.cc
index 27b32b111523..d3c25b566b90 100644
--- a/gcc/rust/checks/errors/rust-const-checker.cc
+++ b/gcc/rust/checks/errors/rust-const-checker.cc
@@ -22,6 +22,10 @@
 #include "rust-hir-stmt.h"
 #include "rust-hir-item.h"
 #include "rust-system.h"
+#include "rust-immutable-name-resolution-context.h"
+
+// for flag_name_resolution_2_0
+#include "options.h"
 
 namespace Rust {
 namespace HIR {
@@ -354,8 +358,18 @@ ConstChecker::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;
+    }
   // We don't care about types here
-  if (!resolver.lookup_resolved_name (ast_node_id, &ref_node_id))
+  else if (!resolver.lookup_resolved_name (ast_node_id, &ref_node_id))
     return;
 
   if (auto definition_id = mappings.lookup_node_to_hir (ref_node_id))
diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude
index f91cf3132c79..db10d9739f42 100644
--- a/gcc/testsuite/rust/compile/nr2/exclude
+++ b/gcc/testsuite/rust/compile/nr2/exclude
@@ -27,8 +27,6 @@ closure_no_type_anno.rs
 complex-path1.rs
 complex_qualified_path_in_expr.rs
 const-issue1440.rs
-const1.rs
-const3.rs
 const_generics_3.rs
 const_generics_4.rs
 const_generics_5.rs
@@ -38,7 +36,6 @@ derive_macro1.rs
 derive_macro3.rs
 derive_macro4.rs
 derive_macro6.rs
-diagnostic_underline.rs
 expected_type_args2.rs
 expected_type_args3.rs
 feature_rust_attri0.rs