From patchwork Tue Jan 30 12:07:02 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arthur Cohen X-Patchwork-Id: 1892862 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; unprotected) header.d=embecosm.com header.i=@embecosm.com header.a=rsa-sha256 header.s=google header.b=KCLw4eCz; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4TPPgT0QXjz23fD for ; Tue, 30 Jan 2024 23:32:05 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 09C8D3870881 for ; Tue, 30 Jan 2024 12:32:03 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wr1-x42e.google.com (mail-wr1-x42e.google.com [IPv6:2a00:1450:4864:20::42e]) by sourceware.org (Postfix) with ESMTPS id 8690E385782D for ; Tue, 30 Jan 2024 12:11:26 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8690E385782D Authentication-Results: sourceware.org; dmarc=none (p=none dis=none) header.from=embecosm.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=embecosm.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8690E385782D Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::42e ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616712; cv=none; b=hRfgkh/ojEObyuvQBqNaRVBtAQJuDfUFOpCtuMmr3L66vYCLi2B7k8FIEXb0axgfMO7gWCAQgWdcnc0pV7ntiAW7XT99hLnBZ8aNlh1hmx1Rp/VeOKzcGDnUjapDuMi9AHgeGzUPTpH9NflOWa1z7OEBSPehVxfSBemnR6+Kxus= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616712; c=relaxed/simple; bh=NYOKnVWnKhuvmoZGlMgKSFSfqUCcGPbjfw86tAxUk7w=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=Mca85TKAiONgEhiXodJSwW9aKHHySIq5B4gSUdwFNmJFvtop03JPzLYsE40QoI07NNQLtNsx2PmH2n6vkQW1b8UUYIHeLViXf7xxfVYJEBf0/dQ5pHx+/rVYhV8ykGXGJlnsxERG5A2szWmX2qiD4vS4MzhWReVeeO9YDvoSvrM= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wr1-x42e.google.com with SMTP id ffacd0b85a97d-33ae3be1c37so1526878f8f.0 for ; Tue, 30 Jan 2024 04:11:26 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616684; x=1707221484; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:from:to:cc:subject :date:message-id:reply-to; bh=va+LYfijWme9/ALyMlaIBEYoWp8IPMW9d86uzJ8zUvw=; b=KCLw4eCz6MsAeiyd9X/a0Z4m5jduafUBwQK0mJz6WNYdki0ng+96bwQ56dgT7KX5CR X0I6Q9PqxZxZlEjsU1a6lHGS+0M++Drn1/+/FRyWsBzHbaps0Xho5sRocU89mlwXLQcc PtQ35PpvnPQHQIqOlKcTbnQyVUB6jTO8ZwJSz2CZTQrpG8sYWuzr7lN4v2+sMGh7fjGL jAC/f49IFgloehgrGEVSjImGYPCsSYmrELql3/vfjpcrHKg0uJaFy3YpRGyi+Kcz9Qjv NpP8VszKfRySFSsBZ1hIgf6d45WN8eMGgmxFmw1Ce4cYgLMUy9uW7al9E9agwvIMtYYb 4Qmg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616684; x=1707221484; h=content-transfer-encoding:mime-version:reply-to:references :in-reply-to:message-id:date:subject:cc:to:from:x-gm-message-state :from:to:cc:subject:date:message-id:reply-to; bh=va+LYfijWme9/ALyMlaIBEYoWp8IPMW9d86uzJ8zUvw=; b=ppyzzwbLj6/GtSJRppFHY3b68MlHROq2QB3Ln0ozjM5mWX7xREMMIk08KI7CKRfghG s0TtyIOZlP2kXUdBCCX9KEmOvD/p+UNyZA8vaCL6Fs3Lotm9wUX3+ODncDTu2LjyCvt1 eSwoFOu0VXp5dHlcjkNHPEokPPrnP0o+oZWd37BJbJWTg35qu/lR7FRLjbqhFZfFlPxc WurKDQF2K/idE1q8gP/hCgxTUmLI8jbdBcEczZnBFFwzr/qhvV4x32a5jl8vmBmnontD k/oXp1fsL3yWP24j++rhBEqavuPN2+tBqY7S5c26ap4kGX0z3pusp6kKnr6gUuRktXo9 IgWQ== X-Gm-Message-State: AOJu0YwRhlWHVX83NWdg6aFNg3P+nrzw5TYVvrzpcp+DkDJAP13ERLro CC0XSelQwnOGDsSUEIHLS9C8yd/M11WNUAlxPtZA36CMMzbB67v3TxzMvvM6shKeYB9aNUgUCS8 haw== X-Google-Smtp-Source: AGHT+IGWGcUNTuQC25ZfvP+JbP3gDwijZa0cT1CKusz1GJcZz07NfbTBsLwyCDOeQxPIHGIvIY8kpw== X-Received: by 2002:a5d:4a92:0:b0:33a:de67:fbb0 with SMTP id o18-20020a5d4a92000000b0033ade67fbb0mr1229656wrq.6.1706616684580; Tue, 30 Jan 2024 04:11:24 -0800 (PST) Received: from platypus.localdomain ([62.23.166.218]) by smtp.gmail.com with ESMTPSA id f9-20020a056000036900b00339307d9d31sm10569894wrf.112.2024.01.30.04.11.24 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:24 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Pierre-Emmanuel Patry Subject: [COMMITTED 046/101] gccrs: Parse module safety Date: Tue, 30 Jan 2024 13:07:02 +0100 Message-ID: <20240130121026.807464-49-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 In-Reply-To: <20240130121026.807464-2-arthur.cohen@embecosm.com> References: <20240130121026.807464-2-arthur.cohen@embecosm.com> MIME-Version: 1.0 X-Spam-Status: No, score=-14.2 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, DKIM_VALID_EF, GIT_PATCH_0, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP, T_SCC_BODY_TEXT_LINE autolearn=unavailable autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: arthur.cohen@embecosm.com Errors-To: gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org From: Pierre-Emmanuel Patry Unsafe module are rejected at a later stage but could not be parsed properly. This commit changes the parser in order to allow unsafe module in the AST. gcc/rust/ChangeLog: * parse/rust-parse-impl.h (Parser::parse_vis_item): Dispatch to parse module when meeting an unsafe module. (Parser::parse_module): Set unsafe status when the parser encounter an unsafe keyword. Signed-off-by: Pierre-Emmanuel Patry --- gcc/rust/parse/rust-parse-impl.h | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index 2e24a66123b..8087e0c2b94 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -1418,6 +1418,8 @@ Parser::parse_vis_item (AST::AttrVec outer_attrs) return parse_function (std::move (vis), std::move (outer_attrs)); case IMPL: return parse_impl (std::move (vis), std::move (outer_attrs)); + case MOD: + return parse_module (std::move (vis), std::move (outer_attrs)); default: add_error ( Error (t->get_locus (), @@ -2427,6 +2429,13 @@ std::unique_ptr Parser::parse_module (AST::Visibility vis, AST::AttrVec outer_attrs) { + Unsafety safety = Unsafety::Normal; + if (lexer.peek_token ()->get_id () == UNSAFE) + { + safety = Unsafety::Unsafe; + skip_token (UNSAFE); + } + location_t locus = lexer.peek_token ()->get_locus (); skip_token (MOD); @@ -2447,7 +2456,7 @@ Parser::parse_module (AST::Visibility vis, // Construct an external module return std::unique_ptr ( new AST::Module (std::move (name), std::move (vis), - std::move (outer_attrs), locus, Unsafety::Normal, + std::move (outer_attrs), locus, safety, lexer.get_filename (), inline_module_stack)); case LEFT_CURLY: { lexer.skip_token (); @@ -2504,8 +2513,7 @@ Parser::parse_module (AST::Visibility vis, return std::unique_ptr ( new AST::Module (std::move (name), locus, std::move (items), - std::move (vis), Unsafety::Normal, - std::move (inner_attrs), + std::move (vis), safety, std::move (inner_attrs), std::move (outer_attrs))); // module name? } default: