Message ID | 20240130121026.807464-49-arthur.cohen@embecosm.com |
---|---|
State | Unresolved |
Headers |
Return-Path: <gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org> Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2087:b0:106:209c:c626 with SMTP id gs7csp1185912dyb; Tue, 30 Jan 2024 04:33:02 -0800 (PST) X-Google-Smtp-Source: AGHT+IH5BnbLPTRK+3gV9LZJOZyuwucMHUqxwXWTDQGjxSbkCW7NMpoELIAbWIgJhGGqIcvKhzuM X-Received: by 2002:a05:6214:dcc:b0:685:20b0:e5c7 with SMTP id 12-20020a0562140dcc00b0068520b0e5c7mr9381219qvt.18.1706617982200; Tue, 30 Jan 2024 04:33:02 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706617982; cv=pass; d=google.com; s=arc-20160816; b=IW74JBlUCf2YJ6WBCyyB1Y9n6gIEsm7J4HJ1mde9js2ucLGPO0vPw80pRwCUWwaHnW BFlOLPTUAneEWQ8na8Muj3efXhh2at4t8t6cOTfbsxL6jn1h4CggoAIoLLY84MwK3aGl EH0MHpP2f5dDRTSjQ74WgkpcQb2Oho8VGTbaa+GXVqVZzFN1dzjWlW6jR+mQkDkQi4bv vnkvHfcXMcLrI0Dqvz+jPf8wcXXKrD29+D5DxmeY1fTbVBCLAMqr7Q4mWcFdUlz2Povj tMCOeJzAy0AUlSIulxbusDldePeEX0gCk1sQ0rs8hbA3FlN6IePKNzziP1dxUz04EMXJ MGkA== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:reply-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature:arc-filter:dmarc-filter:delivered-to; bh=va+LYfijWme9/ALyMlaIBEYoWp8IPMW9d86uzJ8zUvw=; fh=s1GzlUPo1djGkCl3rkRJI30hDOSCVwGp0RAbVwQ8dxQ=; b=ul1MAJv6o/q26vCp+s6BFQ/icGsWQB5h+mMaBoJRH7JdvXZjsTHSIro8IceChhtXsU e9D34tORj30Qo46QmbKT41Q3GC0s9223ee/TLUlZCSGx9Hd1a+cn10/W+oBCfQ2dc6Ge /R76GH/u68e4qOens6t+iUioAlNVZgNk0egmp91x1s1yuLOugcJquU+77vGjaoWGKtly n/Kynm8wWfFp6WpR4S+zDzlp7rMYGj8SUg9lqge6MGD87/vJCa5i4PXYMb+zC1Mckj8F /erOoahELOdX6iWnDGvKtGeNf0qhOg7i7SsoPQIacIM3tCZqfSeL44u66jizxiWIfaiZ Y3vA== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=KCLw4eCz; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id gw12-20020a0562140f0c00b006817d309c9csi10024268qvb.280.2024.01.30.04.33.02 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:33:02 -0800 (PST) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) client-ip=2620:52:3:1:0:246e:9693:128c; Authentication-Results: mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=KCLw4eCz; arc=pass (i=1); spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 2620:52:3:1:0:246e:9693:128c as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org" Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A8842386EC0E for <ouuuleilei@gmail.com>; Tue, 30 Jan 2024 12:32:35 +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 <gcc-patches@gcc.gnu.org>; 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 <gcc-patches@gcc.gnu.org>; 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-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 <pierre-emmanuel.patry@embecosm.com> 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 Content-Transfer-Encoding: 8bit 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 <gcc-patches.gcc.gnu.org> List-Unsubscribe: <https://gcc.gnu.org/mailman/options/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=unsubscribe> List-Archive: <https://gcc.gnu.org/pipermail/gcc-patches/> List-Post: <mailto:gcc-patches@gcc.gnu.org> List-Help: <mailto:gcc-patches-request@gcc.gnu.org?subject=help> List-Subscribe: <https://gcc.gnu.org/mailman/listinfo/gcc-patches>, <mailto:gcc-patches-request@gcc.gnu.org?subject=subscribe> Reply-To: arthur.cohen@embecosm.com Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1789518657223285108 X-GMAIL-MSGID: 1789518657223285108 |
Series |
[COMMITTED,001/101] gccrs: Add visibility to trait item
|
|
Checks
Context | Check | Description |
---|---|---|
snail/gcc-patch-check | warning | Git am fail log |
Commit Message
Arthur Cohen
Jan. 30, 2024, 12:07 p.m. UTC
From: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> 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 <pierre-emmanuel.patry@embecosm.com> --- 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<ManagedTokenSource>::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<AST::Module> Parser<ManagedTokenSource>::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<ManagedTokenSource>::parse_module (AST::Visibility vis, // Construct an external module return std::unique_ptr<AST::Module> ( 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<ManagedTokenSource>::parse_module (AST::Visibility vis, return std::unique_ptr<AST::Module> ( 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: