From: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Date: Mon, 31 Mar 2025 15:01:18 +0000 (+0200)
Subject: Add check for label
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=676e3eacc36a233dec52023faa9f3c78007bbabe;p=thirdparty%2Fgcc.git

Add check for label

gcc/rust/ChangeLog:

	* ast/rust-ast-visitor.cc (DefaultASTVisitor::visit): Visit loop label
	only if it exists.

gcc/testsuite/ChangeLog:

	* rust/compile/nr2/exclude: Remove passing test.

Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
---

diff --git a/gcc/rust/ast/rust-ast-visitor.cc b/gcc/rust/ast/rust-ast-visitor.cc
index 2949f1cc81b..b5da001da5a 100644
--- a/gcc/rust/ast/rust-ast-visitor.cc
+++ b/gcc/rust/ast/rust-ast-visitor.cc
@@ -568,7 +568,8 @@ DefaultASTVisitor::visit (AST::WhileLoopExpr &expr)
 {
   visit_outer_attrs (expr);
   visit (expr.get_predicate_expr ());
-  visit (expr.get_loop_label ());
+  if (expr.has_loop_label ())
+    visit (expr.get_loop_label ());
   visit (expr.get_loop_block ());
 }
 
diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude
index 76ef39f982d..2f4585cbe8c 100644
--- a/gcc/testsuite/rust/compile/nr2/exclude
+++ b/gcc/testsuite/rust/compile/nr2/exclude
@@ -23,8 +23,6 @@ derive-default1.rs
 derive-eq-invalid.rs
 derive-hash1.rs
 torture/alt_patterns1.rs
-torture/loop4.rs
-torture/loop8.rs
 torture/name_resolve1.rs
 issue-3568.rs
 issue-3663.rs