From 912ebb6b74936e6e69bba116af7e45caab3c414c Mon Sep 17 00:00:00 2001 From: Owen Avery Date: Tue, 18 Feb 2025 03:06:09 -0500 Subject: [PATCH] nr2.0: Make sure PathInExpression is default resolved gcc/rust/ChangeLog: * resolve/rust-late-name-resolver-2.0.cc (Late::visit): Call DefaultResolver::visit earlier, in order to ensure it is called even if Late::visit returns early. gcc/testsuite/ChangeLog: * rust/compile/nr2/exclude: Remove entries. Signed-off-by: Owen Avery --- gcc/rust/resolve/rust-late-name-resolver-2.0.cc | 4 ++-- gcc/testsuite/rust/compile/nr2/exclude | 5 ----- 2 files changed, 2 insertions(+), 7 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 f7a36d8efbd..d7bd046d3f8 100644 --- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc @@ -255,6 +255,8 @@ Late::visit (AST::PathInExpression &expr) // in a function item` error here? // do we emit it in `get`? + DefaultResolver::visit (expr); + if (expr.is_lang_item ()) { ctx.map_usage (Usage (expr.get_node_id ()), @@ -284,8 +286,6 @@ 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 02da99de52f..763387f3548 100644 --- a/gcc/testsuite/rust/compile/nr2/exclude +++ b/gcc/testsuite/rust/compile/nr2/exclude @@ -12,9 +12,6 @@ issue-1901.rs issue-1981.rs issue-2043.rs issue-2330.rs -issue-2723-1.rs -issue-2723-2.rs -issue-2782.rs issue-2812.rs issue-850.rs issue-855.rs @@ -36,7 +33,6 @@ self-path1.rs self-path2.rs sizeof-stray-infer-var-bug.rs struct-expr-parse.rs -traits3.rs undeclared_label.rs use_1.rs v0-mangle1.rs @@ -45,7 +41,6 @@ while_break_expr.rs exhaustiveness2.rs issue-3139-2.rs issue-3033.rs -issue-3009.rs issue-2953-2.rs issue-2905-2.rs issue-266.rs