From patchwork Tue Jan 16 21:28:13 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 84214 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id A16BA3857BB0 for ; Tue, 16 Jan 2024 21:28:57 +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.129.124]) by sourceware.org (Postfix) with ESMTPS id 40A473857C43 for ; Tue, 16 Jan 2024 21:28:29 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 40A473857C43 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 40A473857C43 Authentication-Results: server2.sourceware.org; arc=none smtp.remote-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705440511; cv=none; b=f7SSgSUw6c8J0Z/SKj0rMgmlflBxTDTAZMi/M6Eijh/Cx9kE9uOdmdC92q4ElSzZ4edv13HmAAvnM64S49+E+fCQhTf8NT3yaiORbNLB/ieps69Hyguzcgqqi29Xp/cwIYM6yYdCZp9tRifgE/yhumxk4MP/qZnZVWfn+arEGcc= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1705440511; c=relaxed/simple; bh=iT68oAY/RxupeVeNQFgajc4dVGz956hnj/iq+YXlBoQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=UQc9Luo0gmvOeNjFEjvvdoDizSzVkuroMLE/9K6+J2cLA7VrgiFuoTx1JT5p5A2tbWFp9V8Ts8kZ6heG57P609DE8zBf4p5QIQR9ypWAdtMO/i3FEs9JCFj8RMk1f+imtLOkNE0Xr+PoiMl4YRZWhqwAmv29R+TtTf8tskZNHb0= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705440508; 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=Ep4EZbIpiDlFQ8c+yw/BU8i+gHpL/xAljbtclBDMpyY=; b=PP5ME9IaOtVVg79BW1A8DAGbMDOMaMuwrQEMQFxeeyeBhP7GyVMcMzWGp58AWzDo6/OG6f xwNf7zdiRATenF4uLmGkLwyAH15gC1PI81ItGCzSqAayxqBawqUrpQ7hFtk0RsvjLjhOy3 pea6BGze7FEh3GcCpV6goLmLu1wiubg= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-103-aJ6AS6plPhuWd36HHRG_ww-1; Tue, 16 Jan 2024 16:28:26 -0500 X-MC-Unique: aJ6AS6plPhuWd36HHRG_ww-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 AD18E2837803 for ; Tue, 16 Jan 2024 21:28:25 +0000 (UTC) Received: from pdp-11.lan (unknown [10.22.18.55]) by smtp.corp.redhat.com (Postfix) with ESMTP id 8D28B2026D6F; Tue, 16 Jan 2024 21:28:25 +0000 (UTC) From: Marek Polacek To: GCC Patches , Jason Merrill Subject: [PATCH] c++: fix ICE with xobj in destructor [PR113340] Date: Tue, 16 Jan 2024 16:28:13 -0500 Message-ID: <20240116212813.999293-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.4 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-13.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_H4, 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+patchwork=sourceware.org@gcc.gnu.org Bootstrapped/regtested on x86_64-pc-linux-gnu, ok for trunk? -- >8 -- Here we crash in maybe_retrofit_in_chrg on an invalid dtor with explicit this. Such member functions do not get converted to METHOD_TYPE. If a dtor gets parameters, we reset arg_types to void_list_node in grokdeclarator. This results in m_r_in_c receiving: void (void) and crashing on parms = DECL_CHAIN (DECL_ARGUMENTS (fn)); This patch avoid the ICE by resetting is_xobj_member_function after emitting the error. Then m_r_in_c gets void S:: (struct S *) which does not cause a crash. PR c++/113340 gcc/cp/ChangeLog: * decl.cc (grokdeclarator) : Clear is_xobj_member_function in case of an error. gcc/testsuite/ChangeLog: * g++.dg/cpp23/explicit-obj-diagnostics9.C: New test. --- gcc/cp/decl.cc | 1 + gcc/testsuite/g++.dg/cpp23/explicit-obj-diagnostics9.C | 6 ++++++ 2 files changed, 7 insertions(+) create mode 100644 gcc/testsuite/g++.dg/cpp23/explicit-obj-diagnostics9.C base-commit: 6a6f338c1cbfc2585cd85358a83e601fb959445e diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index b10a72a87bf..2e5702971c4 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -13743,6 +13743,7 @@ grokdeclarator (const cp_declarator *declarator, "destructors may not have parameters"); arg_types = void_list_node; parms = NULL_TREE; + is_xobj_member_function = false; } type = build_function_type (type, arg_types); diff --git a/gcc/testsuite/g++.dg/cpp23/explicit-obj-diagnostics9.C b/gcc/testsuite/g++.dg/cpp23/explicit-obj-diagnostics9.C new file mode 100644 index 00000000000..d420793c1e1 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp23/explicit-obj-diagnostics9.C @@ -0,0 +1,6 @@ +// PR c++/113340 +// { dg-do compile { target c++23 } } + +struct S { + ~S(this S &) = default; // { dg-error "destructors may not have parameters" } +};