From: Pierre-Emmanuel Patry <[email protected]>
gcc/rust/ChangeLog:
* resolve/rust-late-name-resolver-2.0.h: Add visit function prototype.
* resolve/rust-late-name-resolver-2.0.cc (Late::visit): Change resolved
type segment.
Signed-off-by: Pierre-Emmanuel Patry <[email protected]>
---
gcc/rust/resolve/rust-late-name-resolver-2.0.cc | 13 +++++++++++--
gcc/rust/resolve/rust-late-name-resolver-2.0.h | 1 +
2 files changed, 12 insertions(+), 2 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 df67b4f9873..287972c34ce 100644
--- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
@@ -224,14 +224,23 @@ Late::visit (AST::TypePath &type)
// maybe we can overload `resolve_path<Namespace::Types>` to only do
// typepath-like path resolution? that sounds good
- auto resolved = ctx.types.get (type.get_segments ().back ()->as_string ());
- if (resolved)
+ auto str = type.get_segments ().back ()->get_ident_segment ().as_string ();
+ auto values = ctx.types.peek ().get_values ();
+
+ if (auto resolved = ctx.types.get (str))
ctx.map_usage (Usage (type.get_node_id ()),
Definition (resolved->get_node_id ()));
else
rust_unreachable ();
}
+void
+Late::visit (AST::StructStruct &s)
+{
+ auto s_vis = [this, &s] () { AST::DefaultASTVisitor::visit (s); };
+ ctx.scoped (Rib::Kind::Item, s.get_node_id (), s_vis);
+}
+
void
Late::visit (AST::StructExprStructBase &s)
{
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 b44b2d96387..c4d0d82162e 100644
--- a/gcc/rust/resolve/rust-late-name-resolver-2.0.h
+++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.h
@@ -48,6 +48,7 @@ public:
void visit (AST::TypePath &) override;
void visit (AST::StructExprStructBase &) override;
void visit (AST::StructExprStructFields &) override;
+ void visit (AST::StructStruct &) override;
private:
/* Setup Rust's builtin types (u8, i32, !...) in the resolver */
--
2.45.2
