From patchwork Tue Jun 27 05:38:11 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Richard Sandiford X-Patchwork-Id: 113226 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a59:994d:0:b0:3d9:f83d:47d9 with SMTP id k13csp7965294vqr; Mon, 26 Jun 2023 22:39:16 -0700 (PDT) X-Google-Smtp-Source: ACHHUZ5gi1aNVxg4NM0FyOgbCjt3xYWrKnnZquspH5g4eWHEcDQBuyUTQmposZjBwPxlNZuUt2un X-Received: by 2002:a17:907:60d4:b0:988:a578:4d65 with SMTP id hv20-20020a17090760d400b00988a5784d65mr21272132ejc.32.1687844356685; Mon, 26 Jun 2023 22:39:16 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1687844356; cv=none; d=google.com; s=arc-20160816; b=DoVaD7+acDVgfSnPjzhBt675K04D/RKONg2oW9jOuTsznnbw6sIR9efGm2Iid94A4g LqOHjoPatp/ZgScucKFwnMFF1H/tblGtrvW2u+c8mpilWARF2S1xkF0TlRGH3j3aJ02H G7qPx4TfCcexWMv7g5gvfX/bxGbWTE7R628SqBDGVb4wBQH/LkhJTBDi+Kc0qGy9Jx+N vOodMEdyGLAovBjm//UqXV8luTFFKFAAVTCpOdzhb6CJeIaEs9jdqVEjilUt2Tb3u0Qp wGnotOs3t4sM1b/gFea8N+RI4mYzqONRvWpjz4pMmKaMgVVdT5hiCUZndEabhBvxvE4J Me+w== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=sender:errors-to:reply-to:from:list-subscribe:list-help:list-post :list-archive:list-unsubscribe:list-id:precedence:mime-version :user-agent:message-id:date:subject:mail-followup-to:to:dmarc-filter :delivered-to:dkim-signature:dkim-filter; bh=GBMv42UWOTVlp4o/IsUdScV5b5bHXOTNSB99j/W5aiU=; fh=hPrbWPhweUx4V0GV9uXJqbyAzg2ABmTz7kczrAQqMmM=; b=KqmEe25UgHKKOC3GhVhurlshpC0IeepCWXpW0DGVbLJRxkmsmBZYDiBneRt9Iz9vFV iN7hmyESvVVJyiDuoMMlJ7id3mVKCsfAI4Bfa2GM6mcOw6SAdVB9L6UnNzFFdxL8O6C3 4whvpMWl3btABd2arSuuQe0v8BI5j37WtQLqvefjcR9wSDePh/q5Mjabn41b9PKVhJjM HiGiOE3RjFtMwHdQPwb0rUglysazfQbcrIAnSnpCN0mENQkth46Cn+IxtdILdDVfzCaf lwfId2E7M4olvBjME1Wqd02Mx4+ljP58AKam+fJyljwOpCMDkK0vsGhJvEcgvdOTuetu Y5Cg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=WcnPLTzD; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from sourceware.org (ip-8-43-85-97.sourceware.org. [8.43.85.97]) by mx.google.com with ESMTPS id s21-20020a170906a19500b0098d22334ee0si3819467ejy.797.2023.06.26.22.39.16 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 26 Jun 2023 22:39:16 -0700 (PDT) Received-SPF: pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) client-ip=8.43.85.97; Authentication-Results: mx.google.com; dkim=pass header.i=@gcc.gnu.org header.s=default header.b=WcnPLTzD; spf=pass (google.com: domain of gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org designates 8.43.85.97 as permitted sender) smtp.mailfrom="gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=gnu.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 11D933857C44 for ; Tue, 27 Jun 2023 05:38:56 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 11D933857C44 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1687844336; bh=GBMv42UWOTVlp4o/IsUdScV5b5bHXOTNSB99j/W5aiU=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=WcnPLTzDwuef46C8cdGAxAOu8kWpEMpKX1YCrfpZvTUeGkvVwr1z3PWR+EeR3zs46 1EvJn9h+024G1S19aRWOwXyMzUsCDaimZo/y/uwbNtNiLnXG3iZsC0+FxvVWWalzin SEBf2MPB2pwpvysXNQueHvcLfJ3WhVSkgz+DEfA4= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by sourceware.org (Postfix) with ESMTP id 42E663858D35 for ; Tue, 27 Jun 2023 05:38:13 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 42E663858D35 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id BDD2D2F4 for ; Mon, 26 Jun 2023 22:38:56 -0700 (PDT) Received: from localhost (e121540-lin.manchester.arm.com [10.32.110.72]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 49AC73F73F for ; Mon, 26 Jun 2023 22:38:12 -0700 (PDT) To: gcc-patches@gcc.gnu.org Mail-Followup-To: gcc-patches@gcc.gnu.org, richard.sandiford@arm.com Subject: [PATCH] gengtype: Handle braced initialisers in structs Date: Tue, 27 Jun 2023 06:38:11 +0100 Message-ID: User-Agent: Gnus/5.13 (Gnus v5.13) Emacs/26.3 (gnu/linux) MIME-Version: 1.0 X-Spam-Status: No, score=-27.3 required=5.0 tests=BAYES_00, GIT_PATCH_0, KAM_DMARC_NONE, KAM_DMARC_STATUS, KAM_LAZY_DOMAIN_SECURITY, SPF_HELO_NONE, SPF_NONE, 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-Patchwork-Original-From: Richard Sandiford via Gcc-patches From: Richard Sandiford Reply-To: Richard Sandiford Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org Sender: "Gcc-patches" X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1769833084362722869?= X-GMAIL-MSGID: =?utf-8?q?1769833084362722869?= I have a patch that adds braced initializers to a GTY structure. gengtype didn't accept that, because it parsed the "{ ... }" in " = { ... };" as the end of a statement (as "{ ... }" would be in a function definition) and so it didn't expect the following ";". This patch explicitly handles initialiser-like sequences. Arguably, the parser should also skip redundant ";", but that feels more like a workaround rather than the real fix. Tested on aarch64-linux-gnu & x86_&4-linux-gnu. OK to install? Richard gcc/ * gengtype-parse.cc (consume_until_comma_or_eos): Parse "= { ... }" as a probable initializer rather than a probable complete statement. --- gcc/gengtype-parse.cc | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/gcc/gengtype-parse.cc b/gcc/gengtype-parse.cc index 2b2156c5f45..19184d77899 100644 --- a/gcc/gengtype-parse.cc +++ b/gcc/gengtype-parse.cc @@ -450,6 +450,12 @@ consume_until_comma_or_eos () parse_error ("unexpected end of file while scanning for ',' or ';'"); return false; + case '=': + advance (); + if (token () == '{') + consume_balanced ('{', '}'); + break; + default: advance (); break;