https://gcc.gnu.org/g:a52914f01bf1373e58e6d0a97090781b4cd3282c
commit r15-8863-ga52914f01bf1373e58e6d0a97090781b4cd3282c
Author: Owen Avery <powerboat9.ga...@gmail.com>
Date: Sun Mar 2 20:03:12 2025 -0500
gccrs: 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.ga...@gmail.com>
Diff:
---
gcc/rust/resolve/rust-late-name-resolver-2.0.cc | 28 +++++++++++++++++++++++++
gcc/rust/resolve/rust-late-name-resolver-2.0.h | 1 +
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 09aa5fc44e6e..cf7b7dcd03fb 100644
--- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
@@ -259,6 +259,34 @@ Late::visit (AST::IdentifierExpr &expr)
// toplevel instead insert a name in ctx.values? (like it currently does)
}
+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)
{
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 31303eb4fb2c..ac376b5cb6f8 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 59964fc90e28..fed7bde63070 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
