From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 7905) id 8612A3858C62; Tue, 16 Jan 2024 18:15:19 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 8612A3858C62 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1705428919; bh=6UJq8dVUzbwpz+rIcyWmrjSRvMm9pCtihMrhKH56QcU=; h=From:To:Subject:Date:From; b=R/YQeZX+uf9s5L/bGw4+MxSqXfzE5yTBoq9GaC3STjCpPrYi4GW2AZQq/iYdrEW3e 6NEenT5XEDWsrCmTp+TSPvPr5MleZhY1eLEe2aTzH+S/Bsbdo+LceVmiIk4d2ygTFs STzzswSQsY86Uo98hZ53ocm3RVqTk1u1fY2Feqfk= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Arthur Cohen To: gcc-cvs@gcc.gnu.org Subject: [gcc r14-8062] gccrs: resolve: Resolve labelled block X-Act-Checkin: gcc X-Git-Author: Jakub Dupak X-Git-Refname: refs/heads/trunk X-Git-Oldrev: a66df6197e84b6817d20c494bee7242bbfab0369 X-Git-Newrev: b195d61877e2d0370e616ebef1fb4378cd47b828 Message-Id: <20240116181519.8612A3858C62@sourceware.org> Date: Tue, 16 Jan 2024 18:15:19 +0000 (GMT) List-Id: https://gcc.gnu.org/g:b195d61877e2d0370e616ebef1fb4378cd47b828 commit r14-8062-gb195d61877e2d0370e616ebef1fb4378cd47b828 Author: Jakub Dupak Date: Mon Oct 16 15:25:29 2023 +0200 gccrs: resolve: Resolve labelled block gcc/rust/ChangeLog: * resolve/rust-ast-resolve-expr.cc (ResolveExpr::visit): Resolve using loop logic. Signed-off-by: Jakub Dupak Diff: --- gcc/rust/resolve/rust-ast-resolve-expr.cc | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/gcc/rust/resolve/rust-ast-resolve-expr.cc b/gcc/rust/resolve/rust-ast-resolve-expr.cc index 38d45de32f0..0b6f1b13788 100644 --- a/gcc/rust/resolve/rust-ast-resolve-expr.cc +++ b/gcc/rust/resolve/rust-ast-resolve-expr.cc @@ -303,6 +303,28 @@ ResolveExpr::visit (AST::BlockExpr &expr) resolver->push_new_type_rib (resolver->get_type_scope ().peek ()); resolver->push_new_label_rib (resolver->get_type_scope ().peek ()); + if (expr.has_label ()) + { + auto label = expr.get_label (); + if (label.get_lifetime ().get_lifetime_type () + != AST::Lifetime::LifetimeType::NAMED) + { + rust_error_at (label.get_locus (), + "Labels must be a named lifetime value"); + return; + } + + auto label_name = label.get_lifetime ().get_lifetime_name (); + auto label_lifetime_node_id = label.get_lifetime ().get_node_id (); + resolver->get_label_scope ().insert ( + CanonicalPath::new_seg (label.get_node_id (), label_name), + label_lifetime_node_id, label.get_locus (), false, Rib::ItemType::Label, + [&] (const CanonicalPath &, NodeId, location_t locus) -> void { + rust_error_at (label.get_locus (), "label redefined multiple times"); + rust_error_at (locus, "was defined here"); + }); + } + for (auto &s : expr.get_statements ()) { if (s->is_item ())