From f4150f2631091d44bcf969daa33dd15ca1612166 Mon Sep 17 00:00:00 2001
From: Owen Avery <powerboat9.gamer@gmail.com>
Date: Tue, 4 Feb 2025 05:53:10 -0500
Subject: [PATCH] nr2.0: Run DefaultResolver::visit on PathInExpression

gcc/rust/ChangeLog:

	* resolve/rust-late-name-resolver-2.0.cc
	(Late::visit): When visiting a PathInExpression instance, call
	into DefaultResolver::visit, ensuring generic arguments are
	visited.

gcc/testsuite/ChangeLog:

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

Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
---
 gcc/rust/resolve/rust-late-name-resolver-2.0.cc |  2 ++
 gcc/testsuite/rust/compile/nr2/exclude          | 11 -----------
 2 files changed, 2 insertions(+), 11 deletions(-)

diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
index 5f988a96745..f7a36d8efbd 100644
--- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
@@ -284,6 +284,8 @@ Late::visit (AST::PathInExpression &expr)
 
   ctx.map_usage (Usage (expr.get_node_id ()),
 		 Definition (resolved->get_node_id ()));
+
+  DefaultResolver::visit (expr);
 }
 
 void
diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude
index a400378f071..f490603af69 100644
--- a/gcc/testsuite/rust/compile/nr2/exclude
+++ b/gcc/testsuite/rust/compile/nr2/exclude
@@ -2,20 +2,14 @@ break-rust2.rs
 canonical_paths1.rs
 cfg1.rs
 complex-path1.rs
-const-issue1440.rs
 const_generics_3.rs
 const_generics_4.rs
 const_generics_7.rs
 derive_macro1.rs
-expected_type_args2.rs
 feature_rust_attri0.rs
 generic-default1.rs
-generics3.rs
-generics4.rs
 generics5.rs
 generics9.rs
-issue-1130.rs
-issue-1173.rs
 issue-1483.rs
 issue-1786.rs
 issue-1901.rs
@@ -24,14 +18,12 @@ issue-2043.rs
 issue-2330.rs
 issue-2723-1.rs
 issue-2723-2.rs
-issue-2775.rs
 issue-2782.rs
 issue-2812.rs
 issue-850.rs
 issue-855.rs
 iterators1.rs
 lookup_err1.rs
-macros/mbe/macro40.rs
 macros/mbe/macro43.rs
 macros/mbe/macro44.rs
 macros/mbe/macro6.rs
@@ -43,7 +35,6 @@ nested_macro_use1.rs
 nested_macro_use2.rs
 nested_macro_use3.rs
 not_find_value_in_scope.rs
-privacy4.rs
 privacy5.rs
 privacy8.rs
 macros/proc/attribute_non_function.rs
@@ -59,8 +50,6 @@ self-path2.rs
 sizeof-stray-infer-var-bug.rs
 struct-expr-parse.rs
 traits3.rs
-traits6.rs
-traits7.rs
 undeclared_label.rs
 use_1.rs
 v0-mangle1.rs