aboutsummaryrefslogtreecommitdiff
path: root/gcc/rust/resolve
diff options
context:
space:
mode:
authorPierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>2025-03-31 17:00:11 +0200
committerArthur Cohen <arthur.cohen@embecosm.com>2025-04-08 10:17:16 +0200
commit5d34589597c2af26768e7e4a982622db5eb4b210 (patch)
tree1b1df523a28bb92fb7151959d6ba2b92d26c0333 /gcc/rust/resolve
parentd307dddfc1a7dd406e488b08a390ae5908542b1a (diff)
downloadgcc-5d34589597c2af26768e7e4a982622db5eb4b210.zip
gcc-5d34589597c2af26768e7e4a982622db5eb4b210.tar.gz
gcc-5d34589597c2af26768e7e4a982622db5eb4b210.tar.bz2
gccrs: Resolve labels
gcc/rust/ChangeLog: * hir/rust-ast-lower.cc (ASTLoweringBlock::visit): Lower label only if it exists. * hir/tree/rust-hir-expr.cc (BlockExpr::BlockExpr): Make loop label optional. (BaseLoopExpr::BaseLoopExpr): Likewise. (LoopExpr::LoopExpr): Likewise. (WhileLoopExpr::WhileLoopExpr): Likewise. * hir/tree/rust-hir-expr.h: Use optional for lifetime and labels. * hir/tree/rust-hir.cc (WhileLoopExpr::as_string): Use getter. (WhileLetLoopExpr::as_string): Likewise. (LoopExpr::as_string): Likewise. * resolve/rust-late-name-resolver-2.0.cc (Late::visit): Resolve labels. * resolve/rust-late-name-resolver-2.0.h: Add visit function prototype for loop labels. Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com>
Diffstat (limited to 'gcc/rust/resolve')
-rw-r--r--gcc/rust/resolve/rust-late-name-resolver-2.0.cc19
-rw-r--r--gcc/rust/resolve/rust-late-name-resolver-2.0.h1
2 files changed, 20 insertions, 0 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 d18e7e2..e0006fd 100644
--- a/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
+++ b/gcc/rust/resolve/rust-late-name-resolver-2.0.cc
@@ -213,6 +213,25 @@ Late::visit (AST::BreakExpr &expr)
}
void
+Late::visit (AST::LoopLabel &label)
+{
+ // Shall we move this to visit(AST::Lifetime) or do we need to
+ // keep the context ?
+ auto lifetime = label.get_lifetime ();
+ if (auto resolved = ctx.labels.get (lifetime.as_string ()))
+ {
+ ctx.map_usage (Usage (lifetime.get_node_id ()),
+ Definition (resolved->get_node_id ()));
+ }
+ else
+ {
+ ctx.labels.insert (Identifier (lifetime.as_string (),
+ lifetime.get_locus ()),
+ lifetime.get_node_id ());
+ }
+}
+
+void
Late::visit (AST::IdentifierExpr &expr)
{
// TODO: same thing as visit(PathInExpression) here?
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 ac376b5..e40141c 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::IdentifierExpr &) override;
void visit (AST::StructExprFieldIdentifier &) override;
void visit (AST::BreakExpr &) override;
+ void visit (AST::LoopLabel &) override;
void visit (AST::PathInExpression &) override;
void visit (AST::TypePath &) override;
void visit (AST::Trait &) override;