From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: 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 51EF538582BB for ; Wed, 7 Feb 2024 12:44:01 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 51EF538582BB 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 51EF538582BB 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=1707309844; cv=none; b=bcFibKaHswTsGIB/9tOQopa7zwIjx1WLuU+3qi8G0yHWI0vz3u2p2RkV+Rapp/RbYT6pmtxCcgMhEZNU3iD0sOzaul+JyFnUHUj8y5OMlseUwlne+D5dg3nB8JqP5iNAVu38fqTDJ2XU688e/H63T180nyLFRyb3cmhgEy98Lgk= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1707309844; c=relaxed/simple; bh=OYaHbYEg1Xa7OWC+Elpa6YqFmUg5IG9jOXaRSUIDdC0=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=lryukG97viVVN7iMwedNKdLvSx3+4w6aQ5SVjQOTr7Aso0Zcpny/IXRsMSdKLQ/goVml/NAzu8iC4MBN5NmBwMq0ze3EhHeo6tWzC+dbxqP0jKdbrnfuqZShKyazDwlXJRnepIFXxZRgGIG1aQgEkkrt5F+F2BAYVUCY9ykIcrU= ARC-Authentication-Results: i=1; server2.sourceware.org Received: by mail-wm1-x32b.google.com with SMTP id 5b1f17b1804b1-4101e63b296so1543395e9.2 for ; Wed, 07 Feb 2024 04:44:01 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=embecosm.com; s=google; t=1707309840; x=1707914640; darn=gcc.gnu.org; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:from:to:cc:subject:date:message-id:reply-to; bh=/fNGjZZmxhwFlkSqq00nmBtJDdnKifsuatlSnq1lGh4=; b=PnK+QKD+wLSFDhiNVLnUOT7petn1fV1ucdAEdS4CG4IXgMgGWAnjTfLh36dMPygIpn aDhUa/SOcsUQK4X9iJjlpI9CuwS0GtvOdj5pBV3GPViWPBV6un8WfrKTxJ2tS/CI5FlY 5Sg10SEXuTeNY+oQtcLttksrpH28Uma3+b376ucWvNQhbXJIgezLjzEKlMaOvTvn8afk Itq9AH0hlQmx5C3s9YGx91UkKejAv5a7p+f9M8p90yVcxrAAZlU+vBtdmBGM6uZW2LIK 9xdXONHpZ75w7ouf/Zi5ybRmRvTLTxc5mKzzc5ULkxSg66KJoRYm1wayee103LI0s+lG H3Bg== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1707309840; x=1707914640; h=content-transfer-encoding:mime-version:reply-to:message-id:date :subject:cc:to:from:x-gm-message-state:from:to:cc:subject:date :message-id:reply-to; bh=/fNGjZZmxhwFlkSqq00nmBtJDdnKifsuatlSnq1lGh4=; b=L0ddpMByUo18ctAHoXMDQnON7O0abX799Hlld+IF1mv6CEFlNFsFJEvThVsU8Ej543 98pi6FfWYt2a1lACR5HGY9mN7UHfgo0XlCRkVKfN8R5zppc0l2zplOnhGNC7EhIoFuJ8 huHpW6bVwpg0luXWkdk0LJlu0zNT5sslzfA86qW1Rh+VyMEoS0dHyQmmBVyIjznouMPz 8CC3taMYJ5AII0OylGLREYQOUWj/0AnxyStW2TiPhY2h6boB2Kn7UFhY7rv5xjdN8B5a H7vav52Il7NGNNTI1TKy67OzeV5dNh4vsv1wJGvPe4RCStsdmWaS5aSzaz9++eS6kLTL TDVA== X-Gm-Message-State: AOJu0YyoAK+krt0i6mAe3o+2YebYZyO2sh/2nVV4HGN8oRDg1TKtwRyb gvUTPA1QSIHt5fzCwL8GbydJ0UIsEZQ4USYVow9AGDlFdfiYJJ0UITHFzxTvzw== X-Google-Smtp-Source: AGHT+IHe6FVtHY5vGKcFlCpkx7f0J1+nvecGkxmEo3rY9VgBlUSGswbw+svoGT3z8yo8+Tlg7Y8Gtg== X-Received: by 2002:a05:600c:35c3:b0:40e:f589:50bf with SMTP id r3-20020a05600c35c300b0040ef58950bfmr4103428wmq.15.1707309839990; Wed, 07 Feb 2024 04:43:59 -0800 (PST) X-Forwarded-Encrypted: i=1; AJvYcCVMMfN11E1OM2TeNOCJj5ic8cyC2a0jxzptRfsbr9FBuSPbXGMD8Kzp6M87ReeqwAs1s0pJ2kHk4Jn8EM4SdMHdRMWyjEDu Received: from platypus.sou.embecosm-corp.com ([212.69.42.53]) by smtp.gmail.com with ESMTPSA id x19-20020a05600c2a5300b0040fbdd6f69bsm5044188wme.33.2024.02.07.04.43.59 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 07 Feb 2024 04:43:59 -0800 (PST) From: arthur.cohen@embecosm.com To: gcc-patches@gcc.gnu.org Cc: gcc-rust@gcc.gnu.org, Kushal Pal Subject: [COMMITTED 01/25] gccrs: Parse normal functions with `self` parameter correctly Date: Wed, 7 Feb 2024 12:43:47 +0100 Message-ID: <20240207114419.1100894-2-arthur.cohen@embecosm.com> X-Mailer: git-send-email 2.42.1 Reply-To: arthur.cohen@embecosm.com MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Spam-Status: No, score=-13.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=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: From: Kushal Pal Fixes #2812 gcc/rust/ChangeLog: * parse/rust-parse-impl.h (Parser::parse_function): Skip token if its a COMMA. gcc/testsuite/ChangeLog: * rust/compile/issue-2812.rs: New test. Signed-off-by: Kushal Pal --- gcc/rust/parse/rust-parse-impl.h | 4 ++-- gcc/testsuite/rust/compile/issue-2812.rs | 4 ++++ 2 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 gcc/testsuite/rust/compile/issue-2812.rs diff --git a/gcc/rust/parse/rust-parse-impl.h b/gcc/rust/parse/rust-parse-impl.h index c622ed7bc97..89e3731a898 100644 --- a/gcc/rust/parse/rust-parse-impl.h +++ b/gcc/rust/parse/rust-parse-impl.h @@ -2946,8 +2946,8 @@ Parser::parse_function (AST::Visibility vis, && initial_param.error () != ParseSelfError::NOT_SELF) return nullptr; - if (initial_param.has_value ()) - skip_token (COMMA); + if (initial_param.has_value () && lexer.peek_token ()->get_id () == COMMA) + skip_token (); // parse function parameters (only if next token isn't right paren) std::vector> function_params; diff --git a/gcc/testsuite/rust/compile/issue-2812.rs b/gcc/testsuite/rust/compile/issue-2812.rs new file mode 100644 index 00000000000..173259b1291 --- /dev/null +++ b/gcc/testsuite/rust/compile/issue-2812.rs @@ -0,0 +1,4 @@ +// { dg-additional-options "-frust-compile-until=astvalidation" } +fn foo_1(&self); +fn foo_1(&mut self); +fn foo_1(self); -- 2.42.1