From patchwork Tue Nov 7 15:50:42 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Marek Polacek X-Patchwork-Id: 1861146 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=redhat.com header.i=@redhat.com header.a=rsa-sha256 header.s=mimecast20190719 header.b=XreukQT4; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=2620:52:3:1:0:246e:9693:128c; helo=server2.sourceware.org; envelope-from=gcc-patches-bounces+incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=patchwork.ozlabs.org) Received: from server2.sourceware.org (server2.sourceware.org [IPv6:2620:52:3:1:0:246e:9693:128c]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4SPt3v13wCz1yQK for ; Wed, 8 Nov 2023 02:51:07 +1100 (AEDT) Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 03998385843E for ; Tue, 7 Nov 2023 15:51:03 +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 5A7E13857731 for ; Tue, 7 Nov 2023 15:50:50 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 5A7E13857731 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 5A7E13857731 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=1699372251; cv=none; b=TXe9oRCHLnShczy2RoniAvDthan01pAzmlfeFrygr20/E1d1GnC2IjsR0Nqz39UIivkpZZxUQZnsYGYDdMsi2ftvjswIyMgtxkvqxqDzSXK1MKE7BfOgCNFkNRF4zOLfwoueQNgXb+ucmiopEro/wnWH8xf0Ow7V99/U1F5ODUw= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1699372251; c=relaxed/simple; bh=UDhJKItIDq/HLZSbJjKbuX8Coyn/KwM/u9R0k4hteN4=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=L5Gl85eShM4kEXUZEpT8l3jJJVXINm1epLe5drmE/6tf0/laRllpTTV+q6bz5qEGHjATmzuEplLAjkG6fblOpgC6NMBf/HJhSI++dZUlsI2kw4wev1K0FblW8dGT5D+Ti0dPoaKUqSK1QiWqnIwPbtWHnlWeUbsuuo1dDqTQvUE= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1699372249; 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=EjnIkyY/D6ijURkFQskDLH0f3RaLVmJ+vabLlaPoZmU=; b=XreukQT4wtJc8AurzDbS1FlAPGcOE+isMWKreEGLrKleKD08pFK3Xg5VobJGjxkZjT3rOv unEcVfkJ6WGFqt+vdTMh9V7rOegLbPIdJlL3ifHfp5wOWmFsbg/WwXTkFHOUBE4fCgazB0 4CqQpv/ePX0INePcrO9AbJ5fJqrMhkE= 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-673-qC5zveD9OL64r5fPZSpNqw-1; Tue, 07 Nov 2023 10:50:48 -0500 X-MC-Unique: qC5zveD9OL64r5fPZSpNqw-1 Received: from smtp.corp.redhat.com (int-mx09.intmail.prod.int.rdu2.redhat.com [10.11.54.9]) (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 5FD3B1C06539 for ; Tue, 7 Nov 2023 15:50:48 +0000 (UTC) Received: from pdp-11.redhat.com (unknown [10.22.9.176]) by smtp.corp.redhat.com (Postfix) with ESMTP id 3D04D492BE7; Tue, 7 Nov 2023 15:50:48 +0000 (UTC) From: Marek Polacek To: Jason Merrill , Jakub Jelinek , GCC Patches Subject: [PATCH] testsuite: nodiscard-reason-nonstring.C FAIL in C++26 Date: Tue, 7 Nov 2023 10:50:42 -0500 Message-ID: <20231107155042.242699-1-polacek@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.9 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com 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, KAM_NUMSUBJECT, 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+incoming=patchwork.ozlabs.org@gcc.gnu.org Tested on x86_64-pc-linux-gnu, ok for trunk? -- >8 -- Since r14-5071, we emit an extra error for this test (the first one): nodiscard-reason-nonstring.C:5:13: error: expected string-literal before numeric constant nodiscard-reason-nonstring.C:5:36: error: 'nodiscard' attribute argument must be a string constant so the test needs adjusting. gcc/testsuite/ChangeLog: * g++.dg/cpp2a/nodiscard-reason-nonstring.C: Adjust dg-error. --- gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-nonstring.C | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) base-commit: 75e5a467811da4237d5c43b455202c832f6e064e diff --git a/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-nonstring.C b/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-nonstring.C index 091c3e56bd2..cbc04b406c6 100644 --- a/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-nonstring.C +++ b/gcc/testsuite/g++.dg/cpp2a/nodiscard-reason-nonstring.C @@ -2,7 +2,7 @@ /* { dg-do compile { target c++20 } } */ /* { dg-options "-O" } */ -[[nodiscard(123)]] int check1 (void); /* { dg-error "nodiscard\[^\n\r]*must be a string constant" } */ +[[nodiscard(123)]] int check1 (void); /* { dg-error "nodiscard\[^\n\r]*must be a string constant|expected string-literal" } */ void test (void)