diff options
| author | Owen Avery <powerboat9.gamer@gmail.com> | 2025-03-02 20:03:12 -0500 |
|---|---|---|
| committer | CohenArthur <arthur.cohen@embecosm.com> | 2025-03-21 15:14:02 +0000 |
| commit | b4895dae9b30413d77024a445af37b3df12d8dfa (patch) | |
| tree | ee20c6610903e3783931973610f201bea4e06fb2 /gcc | |
| parent | 30ff37aa1669d8c023a73ca5ddd3609a792ee706 (diff) | |
| download | gcc-b4895dae9b30413d77024a445af37b3df12d8dfa.zip gcc-b4895dae9b30413d77024a445af37b3df12d8dfa.tar.gz gcc-b4895dae9b30413d77024a445af37b3df12d8dfa.tar.bz2 | |
nr2.0: Fix StructExprFieldIdentifier handling
gcc/rust/ChangeLog:
* resolve/rust-late-name-resolver-2.0.cc
(Late::visit): Add visitor for StructExprFieldIdentifier.
* resolve/rust-late-name-resolver-2.0.h
(Late::visit): Likewise.
gcc/testsuite/ChangeLog:
* rust/compile/nr2/exclude: Remove entries.
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/rust/resolve/rust-late-name-resolver-2.0.cc | 28 | ||||
| -rw-r--r-- | gcc/rust/resolve/rust-late-name-resolver-2.0.h | 1 | ||||
| -rw-r--r-- | gcc/testsuite/rust/compile/nr2/exclude | 8 |
3 files changed, 29 insertions, 8 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 1d8e661..d1c10e5 100644 --- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc @@ -260,6 +260,34 @@ Late::visit (AST::IdentifierExpr &expr) } void +Late::visit (AST::StructExprFieldIdentifier &expr) +{ + tl::optional<Rib::Definition> resolved = tl::nullopt; + + if (auto value = ctx.values.get (expr.get_field_name ())) + { + resolved = value; + } + // seems like we don't need a type namespace lookup + else + { + rust_error_at (expr.get_locus (), "could not resolve struct field: %qs", + expr.get_field_name ().as_string ().c_str ()); + return; + } + + if (resolved->is_ambiguous ()) + { + rust_error_at (expr.get_locus (), ErrorCode::E0659, "%qs is ambiguous", + expr.as_string ().c_str ()); + return; + } + + ctx.map_usage (Usage (expr.get_node_id ()), + Definition (resolved->get_node_id ())); +} + +void Late::visit (AST::PathInExpression &expr) { // TODO: How do we have a nice error with `can't capture dynamic environment diff --git a/gcc/rust/resolve/rust-late-name-resolver-2.0.h b/gcc/rust/resolve/rust-late-name-resolver-2.0.h index c779935..c9a757e 100644 --- a/gcc/rust/resolve/rust-late-name-resolver-2.0.h +++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.h @@ -46,6 +46,7 @@ public: // resolutions void visit (AST::IdentifierExpr &) override; + void visit (AST::StructExprFieldIdentifier &) override; void visit (AST::BreakExpr &) override; void visit (AST::PathInExpression &) override; void visit (AST::TypePath &) override; diff --git a/gcc/testsuite/rust/compile/nr2/exclude b/gcc/testsuite/rust/compile/nr2/exclude index 59964fc..fed7bde 100644 --- a/gcc/testsuite/rust/compile/nr2/exclude +++ b/gcc/testsuite/rust/compile/nr2/exclude @@ -23,7 +23,6 @@ pub_restricted_1.rs pub_restricted_2.rs pub_restricted_3.rs sizeof-stray-infer-var-bug.rs -struct-expr-parse.rs undeclared_label.rs use_1.rs while_break_expr.rs @@ -40,15 +39,8 @@ derive-eq-invalid.rs derive-hash1.rs torture/alt_patterns1.rs torture/builtin_abort.rs -torture/impl_block3.rs -torture/issue-1434.rs torture/loop4.rs torture/loop8.rs -torture/methods1.rs -torture/methods2.rs -torture/methods3.rs torture/name_resolve1.rs -torture/nested_struct1.rs -torture/struct_init_3.rs torture/uninit-intrinsic-1.rs # please don't delete the trailing newline |