From patchwork Thu Jan 18 01:17:14 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 188978 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2bc4:b0:101:a8e8:374 with SMTP id hx4csp60275dyb; Wed, 17 Jan 2024 17:18:00 -0800 (PST) X-Google-Smtp-Source: AGHT+IFe8MyuD8PD7PPDeEJEeUTGpHEI+FM6lTqSD05yAGKRCiAW/dRvB6bvhPpw/oEXGpFICPM6 X-Received: by 2002:ac8:5c05:0:b0:429:cf8c:6047 with SMTP id i5-20020ac85c05000000b00429cf8c6047mr59476qti.136.1705540680684; Wed, 17 Jan 2024 17:18:00 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1705540680; cv=pass; d=google.com; s=arc-20160816; b=RGyHi/jMb6ab+b5WPaYfFrShWyOwKRnGKN7rVQRJ0EQdz00Nelm8U/OIvhQBOiELpt hti7XWntpN/AYbZ7D11g2B54WDNh3p6e4EmvqVfAa6T+BokYkiEvZtZ5xRMEBVFzhp57 hU6Pc1EOgBTjonOfMH55dWlK42ur50hsUhh+8VNdEeQbV9ydLfoCpjISRxlRz+vigY1Y 6bnHySAGMUdJJnZACDtdqxeTye2vcYMkfeywv20dYVvrFreMVFzYtQwIESpwMhP3hD1f +B1ikXHNoVKvedNICcyCmKR1ZhrJPDTLNl2hrrJcWVWRaUJ+B3xK4Awen2WLKL3o+o0b TC3Q== ARC-Message-Signature: i=2; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=errors-to:list-subscribe:list-help:list-post:list-archive :list-unsubscribe:list-id:precedence:content-transfer-encoding :mime-version:message-id:date:subject:to:from:dkim-signature :arc-filter:dmarc-filter:delivered-to; bh=l60hUZ/BQLGJ2AC6WQQ9uWxE9ECpK/5Yxhqqp6jx6yM=; fh=2BFo3VQCimnyWTJsWe6sNdepvNrW+J/2ctoM6N7MZ0Y=; b=ZUnlIDzIBIfY/bhDtxYpga7Y5FZv+ERVeJfMleDNYk05zI0277Fwe/xV97U7iptQYi xIXCYnb8kdq/8PzjsECJCZ61xYsk9kWg5S1yjBqbNOxAAoGJTeBm1OL71653F905PC5m XCFuHyp/Xnh85oYiSE0OQomNOlWt5S1g8VV3JOLLnBrPzP9oUz8du0oyOKfp6Gf7mvqL t8jKu4YPz4gTRVNWP6n0Zd7IuIC6ygKcv76VvQtAgrUQuHoIvyF6On/Cs6EkmVE5P6TI EpzYFwl8aRWTO9p4+NMWQTvlqE9SfA+frggvwflwFuFNKXNwZEOCOozdOEW1m/liKTDd BHxQ== ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=gZxOk3Ds; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id p14-20020a05622a00ce00b0042a150c1554si1058675qtw.666.2024.01.17.17.18.00 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Jan 2024 17:18:00 -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=@redhat.com header.s=mimecast20190719 header.b=gZxOk3Ds; 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"; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 55E4A385841D for ; Thu, 18 Jan 2024 01:18:00 +0000 (GMT) X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org 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 EAB413858CDB for ; Thu, 18 Jan 2024 01:17:20 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org EAB413858CDB 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 EAB413858CDB 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=1705540642; cv=none; b=wSVkAWK+/wNlzDdXw6ajuopUmOAswrJxCoT45/f4eYm8bVkI6hyjyeA3ZBohjCtiTx29DDK6/yjxW+ZFXNl6U7x7XyvAMlGkPnuR9iKofjX4MWsy8ytWB6KgcZMqSPb8YkOPVy1NfTQ2pXxk6CvYtwEwDUX9mwLAjz29lT7RmNU= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705540642; c=relaxed/simple; bh=t3paG8zpgg1uRvPh3j0h5CNOgKPBezQEWWpCLJjVjYA=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=GtyAdRiGOWnMctDwbuWp9x5D84HsUHj5nlWM4Kv1ROfEqzNmRzm7BLUVGloUdCNG+7VNe2iSAsGoImEZ1BiWj1QuckMZ1uvYxWaHWwukowzXq1ZBmlJOGiZi+rMhIt3jeh6EtxbNe7DWKRtRWTtMfkQDWWEQppNNcUgnM/N1I+4= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705540640; 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; bh=l60hUZ/BQLGJ2AC6WQQ9uWxE9ECpK/5Yxhqqp6jx6yM=; b=gZxOk3Ds0urdTEpaFDflrsgndDCSF166Jt2SIFK7TLOfRHFIZ9Q86ZJIOvYyrX4Z28D29t dQvRDF+wwqj35v1/9WI9iEDozfg0z+GVU5qE7pd9dLHTtTu+8LDG7uDzecyflyywFxQUNQ 1GR0Vjtna0PposYi5jPvBYksZN9RHjc= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-136-B5BIMipFNWisyzoMnRrilg-1; Wed, 17 Jan 2024 20:17:19 -0500 X-MC-Unique: B5BIMipFNWisyzoMnRrilg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.rdu2.redhat.com [10.11.54.1]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mimecast-mx02.redhat.com (Postfix) with ESMTPS id E3A86833A06 for ; Thu, 18 Jan 2024 01:17:18 +0000 (UTC) Received: from pdp-11.redhat.com (unknown [10.22.9.108]) by smtp.corp.redhat.com (Postfix) with ESMTP id BF5E83C25; Thu, 18 Jan 2024 01:17:18 +0000 (UTC) From: Marek Polacek To: GCC Patches , Jason Merrill Subject: [PATCH] c++: ICE when xobj is not the first parm [PR113389] Date: Wed, 17 Jan 2024 20:17:14 -0500 Message-ID: <20240118011714.451164-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.1 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.0 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 X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.30 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: gcc-patches-bounces+ouuuleilei=gmail.com@gcc.gnu.org X-getmail-retrieved-from-mailbox: INBOX X-GMAIL-THRID: 1788389024353780976 X-GMAIL-MSGID: 1788389024353780976 Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? -- >8 -- In grokdeclarator/cdk_function the comment says that the find_xobj_parm lambda clears TREE_PURPOSE so that we can correctly detect an xobj that is not the first parameter. That's all good, but we should also clear the TREE_PURPOSE once we've given the error, otherwise we crash later in check_default_argument because the 'this' TREE_PURPOSE lacks a type. PR c++/113389 gcc/cp/ChangeLog: * decl.cc (grokdeclarator) : Set TREE_PURPOSE to NULL_TREE when emitting an error. gcc/testsuite/ChangeLog: * g++.dg/cpp23/explicit-obj-diagnostics10.C: New test. --- gcc/cp/decl.cc | 1 + gcc/testsuite/g++.dg/cpp23/explicit-obj-diagnostics10.C | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp23/explicit-obj-diagnostics10.C base-commit: 4a8430c8c3abb1c2c14274105b3a621100f251a2 diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 322e48dee2e..3e41fd4fa31 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -13391,6 +13391,7 @@ grokdeclarator (const cp_declarator *declarator, if (TREE_PURPOSE (parm) != this_identifier) continue; bad_xobj_parm_encountered = true; + TREE_PURPOSE (parm) = NULL_TREE; gcc_rich_location bad_xobj_parm (DECL_SOURCE_LOCATION (TREE_VALUE (parm))); error_at (&bad_xobj_parm, diff --git a/gcc/testsuite/g++.dg/cpp23/explicit-obj-diagnostics10.C b/gcc/testsuite/g++.dg/cpp23/explicit-obj-diagnostics10.C new file mode 100644 index 00000000000..354823db166 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp23/explicit-obj-diagnostics10.C @@ -0,0 +1,8 @@ +// PR c++/113389 +// { dg-do compile { target c++23 } } + +struct A { + void foo(A, this A); // { dg-error "only the first parameter" } + void qux(A, this A, // { dg-error "only the first parameter" } + this A); // { dg-error "only the first parameter" } +};