From: Owen Avery <powerboat9.gamer@gmail.com>
Date: Tue, 1 Apr 2025 21:50:32 +0000 (-0400)
Subject: nr2.0: Remove duplicate self visit
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea91cee92d70de35def75cbae69eb4ac3189ee78;p=thirdparty%2Fgcc.git

nr2.0: Remove duplicate self visit

gcc/rust/ChangeLog:

	* ast/rust-ast-visitor.cc
	(DefaultASTVisitor::visit): Remove explicit visitation of a
	function's self parameter, as if it exists it'll be visited as
	one of the function parameters.

gcc/testsuite/ChangeLog:

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

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

diff --git a/gcc/rust/ast/rust-ast-visitor.cc b/gcc/rust/ast/rust-ast-visitor.cc
index 0d2dc00c2b2..2949f1cc81b 100644
--- a/gcc/rust/ast/rust-ast-visitor.cc
+++ b/gcc/rust/ast/rust-ast-visitor.cc
@@ -824,8 +824,6 @@ DefaultASTVisitor::visit (AST::Function &function)
   visit (function.get_qualifiers ());
   for (auto &generic : function.get_generic_params ())
     visit (generic);
-  if (function.has_self_param ())
-    visit (function.get_self_param ());
   for (auto &param : function.get_function_params ())
     visit (param);
   if (function.has_return_type ())
diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude
index adc199e59e3..76ef39f982d 100644
--- a/gcc/testsuite/rust/compile/nr2/exclude
+++ b/gcc/testsuite/rust/compile/nr2/exclude
@@ -1,7 +1,6 @@
 canonical_paths1.rs
 cfg1.rs
 generics9.rs
-issue-2043.rs
 issue-2812.rs
 issue-3315-2.rs
 lookup_err1.rs