Skip to content

Commit 912ebb6

Browse files
powerboat9P-E-P
authored andcommitted
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 <[email protected]>
1 parent bee59d6 commit 912ebb6

File tree

2 files changed

+2
-7
lines changed

2 files changed

+2
-7
lines changed

gcc/rust/resolve/rust-late-name-resolver-2.0.cc

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -255,6 +255,8 @@ Late::visit (AST::PathInExpression &expr)
255255
// in a function item` error here?
256256
// do we emit it in `get<Namespace::Labels>`?
257257

258+
DefaultResolver::visit (expr);
259+
258260
if (expr.is_lang_item ())
259261
{
260262
ctx.map_usage (Usage (expr.get_node_id ()),
@@ -284,8 +286,6 @@ Late::visit (AST::PathInExpression &expr)
284286

285287
ctx.map_usage (Usage (expr.get_node_id ()),
286288
Definition (resolved->get_node_id ()));
287-
288-
DefaultResolver::visit (expr);
289289
}
290290

291291
void

gcc/testsuite/rust/compile/nr2/exclude

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -12,9 +12,6 @@ issue-1901.rs
1212
issue-1981.rs
1313
issue-2043.rs
1414
issue-2330.rs
15-
issue-2723-1.rs
16-
issue-2723-2.rs
17-
issue-2782.rs
1815
issue-2812.rs
1916
issue-850.rs
2017
issue-855.rs
@@ -36,7 +33,6 @@ self-path1.rs
3633
self-path2.rs
3734
sizeof-stray-infer-var-bug.rs
3835
struct-expr-parse.rs
39-
traits3.rs
4036
undeclared_label.rs
4137
use_1.rs
4238
v0-mangle1.rs
@@ -45,7 +41,6 @@ while_break_expr.rs
4541
exhaustiveness2.rs
4642
issue-3139-2.rs
4743
issue-3033.rs
48-
issue-3009.rs
4944
issue-2953-2.rs
5045
issue-2905-2.rs
5146
issue-266.rs

0 commit comments

Comments
 (0)