diff options
| author | Owen Avery <powerboat9.gamer@gmail.com> | 2024-02-28 20:19:04 -0500 |
|---|---|---|
| committer | P-E-P <32375388+P-E-P@users.noreply.github.com> | 2024-06-06 17:50:18 +0000 |
| commit | 75049a3bfee8c3f888994bce3b741a805c631c2a (patch) | |
| tree | 2c7d3d3f93cd9fdbdc22925933b5abce5cd6531f | |
| parent | 646046091b703621c4ba63adb76179c11a1dbb92 (diff) | |
| download | gcc-75049a3bfee8c3f888994bce3b741a805c631c2a.zip gcc-75049a3bfee8c3f888994bce3b741a805c631c2a.tar.gz gcc-75049a3bfee8c3f888994bce3b741a805c631c2a.tar.bz2 | |
Improve handling of ConstantItem during name resolution 2.0
gcc/rust/ChangeLog:
* resolve/rust-default-resolver.cc
(DefaultResolver::visit):
Scope with Rib::Kind::ConstantItem instead
of Rib::Kind::Item.
* resolve/rust-toplevel-name-resolver-2.0.cc
(TopLevel::visit): Remove redundancy in override of
ConstantItem visitor.
Signed-off-by: Owen Avery <powerboat9.gamer@gmail.com>
| -rw-r--r-- | gcc/rust/resolve/rust-default-resolver.cc | 2 | ||||
| -rw-r--r-- | gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc | 5 |
2 files changed, 2 insertions, 5 deletions
diff --git a/gcc/rust/resolve/rust-default-resolver.cc b/gcc/rust/resolve/rust-default-resolver.cc index d9fe9ee..8138a89 100644 --- a/gcc/rust/resolve/rust-default-resolver.cc +++ b/gcc/rust/resolve/rust-default-resolver.cc @@ -487,7 +487,7 @@ DefaultResolver::visit (AST::ConstantItem &item) }; // FIXME: Why do we need a Rib here? - ctx.scoped (Rib::Kind::Item, item.get_node_id (), expr_vis); + ctx.scoped (Rib::Kind::ConstantItem, item.get_node_id (), expr_vis); } } diff --git a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc index b991145..6524a30 100644 --- a/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc +++ b/gcc/rust/resolve/rust-toplevel-name-resolver-2.0.cc @@ -424,10 +424,7 @@ TopLevel::visit (AST::ConstantItem &const_item) insert_or_error_out (const_item.get_identifier (), const_item, Namespace::Values); - auto expr_vis - = [this, &const_item] () { const_item.get_expr ().accept_vis (*this); }; - - ctx.scoped (Rib::Kind::ConstantItem, const_item.get_node_id (), expr_vis); + DefaultResolver::visit (const_item); } bool |