From: Owen Avery <powerboat9.gamer@gmail.com>
Date: Tue, 5 Nov 2024 02:52:14 +0000 (-0500)
Subject: gccrs: Use name resolver 2.0 in VisibilityResolver
X-Git-Tag: basepoints/gcc-16~1040
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1e6a3f76e10d7d9ee3574b7abd9d0281ea2d22d;p=thirdparty%2Fgcc.git

gccrs: Use name resolver 2.0 in VisibilityResolver

gcc/rust/ChangeLog:

	* checks/errors/privacy/rust-visibility-resolver.cc:
	Add includes.
	(VisibilityResolver::resolve_module_path): Use name resolver 2.0
	(when enabled) to lookup path resolutions.

Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
---

diff --git a/gcc/rust/checks/errors/privacy/rust-visibility-resolver.cc b/gcc/rust/checks/errors/privacy/rust-visibility-resolver.cc
index 464ce86e177..f0da7456076 100644
--- a/gcc/rust/checks/errors/privacy/rust-visibility-resolver.cc
+++ b/gcc/rust/checks/errors/privacy/rust-visibility-resolver.cc
@@ -20,6 +20,10 @@
 #include "rust-ast.h"
 #include "rust-hir.h"
 #include "rust-hir-item.h"
+#include "rust-immutable-name-resolution-context.h"
+
+// for flag_name_resolution_2_0
+#include "options.h"
 
 namespace Rust {
 namespace Privacy {
@@ -61,7 +65,22 @@ VisibilityResolver::resolve_module_path (const HIR::SimplePath &restriction,
 	     "cannot use non-module path as privacy restrictor");
 
   NodeId ref_node_id = UNKNOWN_NODEID;
-  if (!resolver.lookup_resolved_name (ast_node_id, &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
+	{
+	  invalid_path.emit ();
+	  return false;
+	}
+    }
+  else if (!resolver.lookup_resolved_name (ast_node_id, &ref_node_id))
     {
       invalid_path.emit ();
       return false;