From patchwork Thu Aug 1 20:20:19 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 95117 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 0FBED385E45F for ; Thu, 1 Aug 2024 20:21: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 ESMTP id 8BFD03858D34 for ; Thu, 1 Aug 2024 20:20:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 8BFD03858D34 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 8BFD03858D34 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=1722543629; cv=none; b=xaPNblGrRzRma3AfTBDpfh3jHDew7wP+o2SNU45DJrJWMpteTlMa3ufYgnWsGYAyWlD5sxMy4l2Lc9QgWmYwb1JugYU4JF6tNPSfz1oq/q9K1hj0xirMxFZChtSZLLjCfyDvRfA3luoGHKkHFJ5kdHUGEoz7mrs8vZu5PHPoL9w= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1722543629; c=relaxed/simple; bh=okc88pLuVV7JHP9qm6f9Jfr+d9a2kM6M94M1cTyz1to=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=oR1v+JTbO3fprphXrqfEYhr2EY9DO+h74LJsxdCmYZWHQfiHP0XlYx9edrJ+8l6TjN2ooPAYcRXSpz19HtPPVr+wScpawiZRGcks+zgVx347DQmjCw+am2EO9ZBf+jR1gV5VI89f/Zfp6RQTzCo1ffjRGM9jP725j9lmN0f6dIM= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1722543628; 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=miV0tc13A6sWIdaumdBeuxYkJ2eKCrRltENkdpOeq9w=; b=KhDUnLf4Akt8xG39ergKDGyk/9ChRgxsoYvNFbHPxVUxE0C3aRlT3XzjOe+UGKvpp3LCmt JiVnOW6LUlCa01jG9sev9fQZLEd67VzlpRYie+hDIfrJojwElF3NcWn2605htEy6/w4sVZ hZXDPdqWULLenxL2NrFp3JYJr8VQUNs= Received: from mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-468-M-P8ZWaMMPesBqhKqsXrFw-1; Thu, 01 Aug 2024 16:20:27 -0400 X-MC-Unique: M-P8ZWaMMPesBqhKqsXrFw-1 Received: from mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.40]) (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 mx-prod-mc-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 24B731956048 for ; Thu, 1 Aug 2024 20:20:26 +0000 (UTC) Received: from pdp-11.redhat.com (unknown [10.22.16.66]) by mx-prod-int-04.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 67FD419560AA; Thu, 1 Aug 2024 20:20:24 +0000 (UTC) From: Marek Polacek To: GCC Patches , Jason Merrill Subject: [PATCH] c++: DR882, main cannot be deleted [PR116169] Date: Thu, 1 Aug 2024 16:20:19 -0400 Message-ID: <20240801202019.3945236-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.40 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.3 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 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 -- This DR clarifies that "int main() = delete;" is ill-formed. PR c++/116169 gcc/cp/ChangeLog: * decl.cc (cp_finish_decl): Disallow deleting ::main. gcc/testsuite/ChangeLog: * g++.dg/DRs/dr882.C: New test. --- gcc/cp/decl.cc | 26 ++++++++++++++++++-------- gcc/testsuite/g++.dg/DRs/dr882.C | 5 +++++ 2 files changed, 23 insertions(+), 8 deletions(-) create mode 100644 gcc/testsuite/g++.dg/DRs/dr882.C base-commit: c5ccdfdcab0b24afba2a661af861bec1d63f0595 diff --git a/gcc/cp/decl.cc b/gcc/cp/decl.cc index 279af21eed0..687ae6937f5 100644 --- a/gcc/cp/decl.cc +++ b/gcc/cp/decl.cc @@ -8649,15 +8649,25 @@ cp_finish_decl (tree decl, tree init, bool init_const_expr_p, && TREE_TYPE (init) == ridpointers[(int)RID_DELETE])) { /* FIXME check this is 1st decl. */ - DECL_DELETED_FN (decl) = 1; - DECL_DECLARED_INLINE_P (decl) = 1; - DECL_INITIAL (decl) - = TREE_CODE (init) == STRING_CST ? init : error_mark_node; - FOR_EACH_CLONE (clone, decl) + if (UNLIKELY (DECL_MAIN_P (decl))) { - DECL_DELETED_FN (clone) = 1; - DECL_DECLARED_INLINE_P (clone) = 1; - DECL_INITIAL (clone) = DECL_INITIAL (decl); + /* [basic.start.main]/3: A program that defines main as deleted + is ill-formed. */ + error ("%<::main%> cannot be deleted"); + DECL_INITIAL (decl) = NULL_TREE; + } + else + { + DECL_DELETED_FN (decl) = 1; + DECL_DECLARED_INLINE_P (decl) = 1; + DECL_INITIAL (decl) + = TREE_CODE (init) == STRING_CST ? init : error_mark_node; + FOR_EACH_CLONE (clone, decl) + { + DECL_DELETED_FN (clone) = 1; + DECL_DECLARED_INLINE_P (clone) = 1; + DECL_INITIAL (clone) = DECL_INITIAL (decl); + } } init = NULL_TREE; } diff --git a/gcc/testsuite/g++.dg/DRs/dr882.C b/gcc/testsuite/g++.dg/DRs/dr882.C new file mode 100644 index 00000000000..c41cf7416a2 --- /dev/null +++ b/gcc/testsuite/g++.dg/DRs/dr882.C @@ -0,0 +1,5 @@ +// DR882 - Defining main as deleted +// PR c++/116169 +// { dg-do compile { target c++11 } } + +int main() = delete; // { dg-error "cannot be deleted" }