From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by sourceware.org (Postfix) with ESMTPS id 8057B387543F for ; Tue, 28 Nov 2023 21:33:06 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8057B387543F Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=redhat.com ARC-Filter: OpenARC Filter v1.0.0 sourceware.org 8057B387543F Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701207187; cv=none; b=cFFJMW83RXNsuNR2LNCFSZ+18V4zgfBYculMNDKAyznqhRP+NgsOK2gACY0xR6TqZbJIrXRc50vbL8pSTGxcF7NFD2apDh5IP3D4nqKWVFS5iEkA+M/A6v2cQoYWEXvaWWa8L3K2y6pIdfop+ACue4z8/7xZ2k971ZIAMHeB6P4= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1701207187; c=relaxed/simple; bh=dNw3ZBp2Ds9RqIKZi+dTUImxFJQKukMWKpZSJA1HZv4=; h=DKIM-Signature:Message-ID:Date:MIME-Version:Subject:To:From; b=BZWl7CL//4rbuNno50f/+Dec6lNaLw2GeGL2u/Il/doXq2zYpKDM586udbF6u0zR5TlObHOBlZ6MBtro2zp5niTUjPa/2BX8ghMSitGC+s303brdFGYwgrrRw7NCCz/xuvdRSKkTZksTgBoZRpfbg8dkqa1D/LX5hmFddZs+LsA= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1701207186; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=6xgTfv0GeE+8JeHL8xw/ND4haR8jMej2ZXaKvgyN+bU=; b=RHWA5mydg+qVVW2R2dCv921jlxyxDulcaTNcADD0/7tntSBuxxwXhH2rp864e40ivEt2s+ WMpSmgYNDU5ni8ZBGErDSP48tdoKpkt8HJvqz8cWH9CKhd3t30F9B2X0qWLy426TljdZRM FNS8dcNAXWDk5D/aqL5+VLDK2osyVnU= Received: from mail-oo1-f70.google.com (mail-oo1-f70.google.com [209.85.161.70]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-686-rNC7XTKeNpeiWPjJtHuRjA-1; Tue, 28 Nov 2023 16:33:04 -0500 X-MC-Unique: rNC7XTKeNpeiWPjJtHuRjA-1 Received: by mail-oo1-f70.google.com with SMTP id 006d021491bc7-58d76aee4c7so2881709eaf.0 for ; Tue, 28 Nov 2023 13:33:04 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1701207183; x=1701811983; h=content-transfer-encoding:in-reply-to:from:references:to :content-language:subject:user-agent:mime-version:date:message-id :x-gm-message-state:from:to:cc:subject:date:message-id:reply-to; bh=6xgTfv0GeE+8JeHL8xw/ND4haR8jMej2ZXaKvgyN+bU=; b=GRlUsDlp+w0b9He51tHrS79jQABUoVvWd8xkk8k57xOLcoPiMcECak6CJYY1RkwX61 lAljcg6QtOgMEdD9zGQXy0R55iF1w5ruFYDDyi3IBwQazg+Hbg8WkNTtg+jkKjJb+3fd rZrGJ3siN17QgS6vlVJXuYPdBSxnaZnvn+7eqeqL9GYtj5wwkVFS4gmC77vnEKmAmSMx DENAHHPfdERq3ggh+b5HkgJxRWcWYq6iTEvjpfCyJLza78+ai7f27AUXtQ8oS3CVZuHY 8I9C2dJ2PmBWcoxWRMSsnbkHD4g9ThrDQ6DVvFZE+/uLW1mgp1DcVsEoManEDo9LWLeH ysXA== X-Gm-Message-State: AOJu0YyCkbUcDgmihCWVI6pwHNGUL6e1VHoXEZCcm2soeKNX2vRnKDh/ Svk3p1CZ7Df2AKib1++I5SgmULqJX6bz23AbVOle2jD/jDMEeC8dIAxayK820Jtx7PMFzfJqkJQ LgXVZcCrJHQeiR/HTIQ== X-Received: by 2002:a05:6820:626:b0:58d:74f2:bb4f with SMTP id e38-20020a056820062600b0058d74f2bb4fmr10457797oow.1.1701207183632; Tue, 28 Nov 2023 13:33:03 -0800 (PST) X-Google-Smtp-Source: AGHT+IEApXYILDzXWptrXwU74dyNf1GXYKfLcEs0Plf2Ve5SKRhvASqz3hHSJNeshPYrNExW0mavNw== X-Received: by 2002:a05:6820:626:b0:58d:74f2:bb4f with SMTP id e38-20020a056820062600b0058d74f2bb4fmr10457790oow.1.1701207183424; Tue, 28 Nov 2023 13:33:03 -0800 (PST) Received: from [192.168.1.145] (130-44-146-16.s12558.c3-0.arl-cbr1.sbo-arl.ma.cable.rcncustomer.com. [130.44.146.16]) by smtp.gmail.com with ESMTPSA id o62-20020a4a4441000000b0058a010374e6sm2075542ooa.39.2023.11.28.13.33.02 (version=TLS1_3 cipher=TLS_AES_128_GCM_SHA256 bits=128/128); Tue, 28 Nov 2023 13:33:02 -0800 (PST) Message-ID: <16d6bc55-c063-4d39-a395-73fe07f7b5f3@redhat.com> Date: Tue, 28 Nov 2023 16:33:02 -0500 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird Subject: Re: [PATCH 2/2] c++: guard more against undiagnosed error_mark_node [PR112658] To: Patrick Palka , gcc-patches@gcc.gnu.org References: <20231128165112.2571430-1-ppalka@redhat.com> <20231128165112.2571430-2-ppalka@redhat.com> From: Jason Merrill In-Reply-To: <20231128165112.2571430-2-ppalka@redhat.com> X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Language: en-US Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-Spam-Status: No, score=-12.1 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,GIT_PATCH_0,RCVD_IN_DNSWL_NONE,RCVD_IN_MSPIKE_H3,RCVD_IN_MSPIKE_WL,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 List-Id: On 11/28/23 11:51, Patrick Palka wrote: > This adds a sanity check to cp_parser_expression_statement similar to > the one in finish_expr_stmt added by r6-6795-g0fd9d4921f7ba2, which > effectively downgrades accepts-invalid/wrong-code bugs like this one > into ice-on-invalid/ice-on-valid ones. OK. > PR c++/112658 > > gcc/cp/ChangeLog: > > * parser.cc (cp_parser_expression_statement): If the statement > is erroneous, make sure we've seen an error. > --- > gcc/cp/parser.cc | 3 +++ > 1 file changed, 3 insertions(+) > > diff --git a/gcc/cp/parser.cc b/gcc/cp/parser.cc > index 2464d1a0783..743d6517b09 100644 > --- a/gcc/cp/parser.cc > +++ b/gcc/cp/parser.cc > @@ -12962,6 +12962,9 @@ cp_parser_expression_statement (cp_parser* parser, tree in_statement_expr) > if (statement == error_mark_node > && !cp_parser_uncommitted_to_tentative_parse_p (parser)) > { > + /* If we ran into a problem, make sure we complained. */ > + gcc_assert (seen_error ()); > + > cp_parser_skip_to_end_of_block_or_statement (parser); > return error_mark_node; > }