Message ID | 20240130121026.807464-55-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 gs7csp1182455dyb; Tue, 30 Jan 2024 04:27:12 -0800 (PST) X-Google-Smtp-Source: AGHT+IGxtb8DmIutUL3Pt3j5bUFojQoubO3BeTI8pWHgYhTrY1/Qhogr0s95saycJO/IJnoYOYdj X-Received: by 2002:a05:6214:1c4d:b0:685:7b4a:2fa7 with SMTP id if13-20020a0562141c4d00b006857b4a2fa7mr8375781qvb.33.1706617631933; Tue, 30 Jan 2024 04:27:11 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706617631; cv=pass; d=google.com; s=arc-20160816; b=AlWIUFgVRKpQGItB1PQgpbA8yNaXSpSB6hvhYdoZBw7Bili/s+YcqQJ0B8fVn7Hs06 dq1fd82iJc1Os4DM9q4JLfRwNQSAHqKwWBSmZpB+0BWlOGPvP+dP/Ft+uVXBQ/mrfjYA cDxNaHOZqKbISOWP+mAZCxQVdomBeqKo6AlHo90dKxXN1IUvf+vWw1zCByTNTcPKr3LY U4kyQtwIZzdCS7Wy7qQLriXqcQzwCBX0Plgf5i0EA4XWgKHhnXPatMCgt8z2XLqtI+rM amYSTSd9RJ7Pb6aST8JBMABw1YDBWjs10GH5LFr2JXyyr0uKPIFbp63ndxVkBFBiDaWk XaYQ== 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=XB5QG9cWh2i6OpCmTXIuUTmITF/AOB6Rg1JfUAMV5Ho=; fh=s1GzlUPo1djGkCl3rkRJI30hDOSCVwGp0RAbVwQ8dxQ=; b=OlDtoVcB1aectrNc1ZTMMO08OnxidpEDmTc+1e0+OcBnncfEbdrfPyArhfPheO3ZXa 8F6vyoDcThWBqp1S9CT2VHlss44zb/VSEUoDTulzFGkIkO/weFD8NDdykXSeBDMUme25 ncYCD3sxPS/DjQxBCXujkWzmmlwm5lkL60UiLYdGiEF42ebUND6E3UIbiGQGsYMljSdf R6RN9kk/UFecw2x51vjmeU1vl1FMzHeuzcC+S3yzGFZ6iHh+XiLFWXV/PzaYy+cqZyGt MoIxZfMujEDIAX3SDXy2b/2mD3Tk6LGiqo68r91X8B0BHakjtQDemmUDLwNsi+PDIfgR sFvw== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@embecosm.com header.s=google header.b=chqv7woo; 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 jp6-20020ad45f86000000b0068c61fc5e81si1067004qvb.272.2024.01.30.04.27.11 for <ouuuleilei@gmail.com> (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:27:11 -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=chqv7woo; 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 54731386102E for <ouuuleilei@gmail.com>; Tue, 30 Jan 2024 12:27:11 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mail-wm1-x32b.google.com (mail-wm1-x32b.google.com [IPv6:2a00:1450:4864:20::32b]) by sourceware.org (Postfix) with ESMTPS id 2DB533857BB6 for <gcc-patches@gcc.gnu.org>; Tue, 30 Jan 2024 12:11:30 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 2DB533857BB6 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 2DB533857BB6 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=2a00:1450:4864:20::32b ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616718; cv=none; b=IiMuogSaAAowYbsXT0PxIHbVwtsJmT7edbca2JJsnjzstlWsX1GORBGYD0V4zLTUooO4g+GaYi+LTu5+XzR6kZoGpZoLFrWqqtqtEQKaQ5N9Uw1N2VnnxYTyKyYp98T7oIYFA5XkLj7YkAkfZGF2j+FLwfB0EfuOPc1ui7XD0XM= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706616718; c=relaxed/simple; bh=+ah8tuaPA+wFxJBJTGEGj5BFQHG7C4ylbpyBQVwsG1A=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=jm+gkReempDHmbLXDKgGpnfjulWKGzLRn1+rrGBSfGDyW/eNm/pc3F1AVL7s+/a3ftQfnDqikfHsCy6ku41rna6udqAYBu2/mykGYXp9yBiOn3cu/3kiTW74WhaCuPXaLvKLGHVWxcKvd/ZwirpSoJ6Fyab/CaEclP3Uu+oPzCA= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-40fafced243so1222535e9.0 for <gcc-patches@gcc.gnu.org>; Tue, 30 Jan 2024 04:11:30 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1706616688; x=1707221488; 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=XB5QG9cWh2i6OpCmTXIuUTmITF/AOB6Rg1JfUAMV5Ho=; b=chqv7wooJY+g2CmM+he2JIsYhMEujhjKCs4ye9VVMszMFyy4TzS1ohXR0GPQ6M4K7y EuzLLMZnBOFrjmFDMnk1QyeMv1KsEMPtD9mSf84WwrxMk+dYpMcDpyIzKOxEtU0QCias qHL0rwJq7OEPNindEp4f0UiPUZiDtXdpxK8vtB0W4chkKvakk0YwuuOU4Jf4k4L3UBFE nKHZNElf1m0bRH0l1hepu1FkDqTADbW4ymHcz2KKgvv0SL2YIz9gZXCYT3CFPEGpY7Sa 1E3lohOaKnJbz9mHqS5F5B/5/bPHVf1jOOPGT3zm397YZmkf2imhXIbLH0BKj5kJCsQ8 m5Cg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1706616688; x=1707221488; 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=XB5QG9cWh2i6OpCmTXIuUTmITF/AOB6Rg1JfUAMV5Ho=; b=qNhGPwEVvxTriYTRSFkdfaLV+Z/SPit4wuS5FMNlM7m5KxR4bgm7045sF+KBNf28u4 2qhj8lLhOqubtUmRKrejApwLVwEbtg6UO7BUuBigZ7ngXXhfa/dSKehMTT9yy5ZbDJ2i FjhdF9XviPq++VEhw2jK+OG7pY9VMk2g8+N9qn+KrfSCrown2WpnlZVxBRKBlOzn1IYP V2Lnflq4LuMVF/EYihduksudcDHvt5LTQx+FuQ1sNBHghN5ikTIJqPWhfU0l4+WHYHVD gvsc+6YhdJ3E5hVoqst5pqb56CGdbVHMu7cERocpLm2QLouyzBtt+zjxNFFtg1GgG8VK PT5w== X-Gm-Message-State: AOJu0Yx1+h27U80t7o1fm1U5qAPgLWgfuoNvpz1PP+xGGBeMm8MlF2W8 /9sLlckVvW7C42Z+4zPgz30Pk6Olih8xQ+CkvGMZzqTnAVCcOSiInVG4oS0/qExMv68zuQxtBMk VUA== X-Received: by 2002:a5d:6483:0:b0:33a:f9fe:9db with SMTP id o3-20020a5d6483000000b0033af9fe09dbmr1720284wri.14.1706616688362; Tue, 30 Jan 2024 04:11:28 -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.28 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Tue, 30 Jan 2024 04:11:28 -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 052/101] gccrs: Allow const and async specifiers in functions Date: Tue, 30 Jan 2024 13:07:08 +0100 Message-ID: <20240130121026.807464-55-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: 1789518290298260267 X-GMAIL-MSGID: 1789518290298260267 |
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> We need to account for const specifiers in async parsing as const can be used in the syntax before the async keyword. gcc/rust/ChangeLog: * parse/rust-parse-impl.h (Parser::parse_vis_item): Allow parsing async items in const. (Parser::parse_async_item): Account for const offset during async lookahead. Signed-off-by: Pierre-Emmanuel Patry <pierre-emmanuel.patry@embecosm.com> --- gcc/rust/parse/rust-parse-impl.h | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index a1ad4f11993..acceec302a2 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -1383,6 +1383,8 @@ Parser<ManagedTokenSource>::parse_vis_item (AST::AttrVec outer_attrs) return parse_const_item (std::move (vis), std::move (outer_attrs)); case UNSAFE: case EXTERN_KW: + case ASYNC: + return parse_async_item (std::move (vis), std::move (outer_attrs)); case FN_KW: return parse_function (std::move (vis), std::move (outer_attrs)); default: @@ -1445,7 +1447,9 @@ std::unique_ptr<AST::Function> Parser<ManagedTokenSource>::parse_async_item (AST::Visibility vis, AST::AttrVec outer_attrs) { - const_TokenPtr t = lexer.peek_token (); + auto offset = (lexer.peek_token ()->get_id () == CONST) ? 1 : 0; + const_TokenPtr t = lexer.peek_token (offset); + if (Session::get_instance ().options.get_edition () == CompileOptions::Edition::E2015) { @@ -1456,7 +1460,7 @@ Parser<ManagedTokenSource>::parse_async_item (AST::Visibility vis, "to use %<async fn%>, switch to Rust 2018 or later")); } - t = lexer.peek_token (1); + t = lexer.peek_token (offset + 1); switch (t->get_id ()) {