From patchwork Thu Feb 1 15:28:52 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jonathan Wakely X-Patchwork-Id: 195363 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a05:7301:2719:b0:106:209c:c626 with SMTP id hl25csp234127dyb; Thu, 1 Feb 2024 07:31:21 -0800 (PST) X-Google-Smtp-Source: AGHT+IGx1Hvb6cXkwrNE4T+zS9NycRplJL7ecAe4DjOmy3XBEY3uz9J6pzvjJy/pc1txt7X7UJTV X-Received: by 2002:a05:620a:b12:b0:77f:dc33:e522 with SMTP id t18-20020a05620a0b1200b0077fdc33e522mr2851847qkg.37.1706801481366; Thu, 01 Feb 2024 07:31:21 -0800 (PST) ARC-Seal: i=2; a=rsa-sha256; t=1706801481; cv=pass; d=google.com; s=arc-20160816; b=K7nKO7YaFjYQ80vtFCvq6/hbAAK0w4l3kWkZHKdDt9odSzMOlCw82Wv40LS6HYCSXI JsFfyrELNdODlHV57ZNcFKGLOXREgIN/A7NzylyQumS0zURIEkqjzu4IRH+jW7gLZ+8Y ASWuwyzUlRyI6yU2eMk2JUk7vgmO+BCad46wL/CwbrMjTjA2YvyCmnKpAg9FXLaiCzyQ LgtmzhRY+jbGsaSXoTVS73K3bi4hhk3UbqOHnZ2UgFj5WyoJlvC3yVPdQNnhynVHGuez CzFSg2kGrAzgEOT/qdxA6uEitdu4qzBlTIAIB8ti+NDQhgsRUiIGpFfe6jVt4hUnzLoQ yfEw== 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=RorIYInUk/fE2P6W+m9lHcKCwTiE7C2LyjTZrnROIK4=; fh=DOzWGwwjhNSeOOpt+k8I2wtJe4dpBijQONPV3vq2wg0=; b=JVpMpkpnW0qMhWTA1Pw7xOSnCHGM4cdUXtm/5Nvh+yVJ/u8JfshRd+9RUGcpAyF+2Y IQ9189pkipcR948HcfvaTxLDtRx+pJ4FZfvpMCv3FGedVkiSnLWEHQ7Y3bFtXjpfh7T7 XAcIN6S4gYtXj94p2iznz6gOGdC6tIJkgEX6vHeQ5gxXBdk/KtsdgAN6Aq9gbGTe+4kc hsg478RVaPbluf17Umg7MXpyfkk5ki8PUW8/9URMN2CO5rFIkpS96IKip/jbOgKsk8TS TYJ4p/IPVGEz/VzI74J7dsrVu+8ZN6OOp3iBAab8MSWMUKv9jlyojOgNOgxLqla1fNLn cKxw==; dara=google.com ARC-Authentication-Results: i=2; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=Iu7ZsoAv; 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 X-Forwarded-Encrypted: i=1; AJvYcCVwEsfQElGA73RF7itsht97bOtPxsOMo10LuaBnmKfBu49jLQag7WNiwEiK1pnSUN/C6w2BcqURnQwqwGmRVs9OGOvNuA== Received: from server2.sourceware.org (server2.sourceware.org. [2620:52:3:1:0:246e:9693:128c]) by mx.google.com with ESMTPS id d20-20020a05620a205400b007853f2207fesi2760689qka.617.2024.02.01.07.31.21 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Thu, 01 Feb 2024 07:31:21 -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=Iu7ZsoAv; 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 B7920385DC37 for ; Thu, 1 Feb 2024 15:31:13 +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 578ED3857C46 for ; Thu, 1 Feb 2024 15:29:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 578ED3857C46 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 578ED3857C46 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=1706801364; cv=none; b=wd4XEH4uWuyNu10tnj0nIlc2O4WTJf9YQuZ4AoKRMjYyMRBGw1sgUd6U8//Dgl4X2mvj4UKLtL0Ioi+71EolPwjgGDi6IeV8jTejLKStCzFBBNI7eLEiIbs9PS7yM6zhIpLJbCbBz4kHJpwTf4EbSyqP/J+DwjhCTFeMKXc0bv8= ARC-Message-Signature: i=1; a=rsa-sha256; d=sourceware.org; s=key; t=1706801364; c=relaxed/simple; bh=IwYpfLajjt9UyE2AxN1KeKFWh7uDSQJZAs3JMJMJ7ZQ=; h=DKIM-Signature:From:To:Subject:Date:Message-ID:MIME-Version; b=JKvP7vqABtLaOvt6yGX7DoGKl0Zve1fBPDcbomaXF+jW4oOaY6C1ZhnAl3kC4vZM64PlaLpRcxCFCUb8QGBgKVpV/+XsnV2gKifz0RuIcmRYhKCXW9V6CxWRVRltbcC1Z/kIB9joXkhvEEp8rCVyJrc/PVJG/YBYSe+UdUZQ9Yo= ARC-Authentication-Results: i=1; server2.sourceware.org DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1706801352; 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=RorIYInUk/fE2P6W+m9lHcKCwTiE7C2LyjTZrnROIK4=; b=Iu7ZsoAv6rkniffsU/Nuj4jhXUrVy5m3EBWgpFsQMnzR/ps8pnOIH1w3DMa9fki9+4ENib dJvLCJXQ9PUgW+FwwH+KVrX3WoE6/fQnJLh3gBzocc+8+0Ec8C8jBHmR1DEPjofj0xfsAb +zfB8HrZbf7IRcYxgkf7swQ+aydDopY= 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-55-tFat2-GLNC62fmWmU3vGEw-1; Thu, 01 Feb 2024 10:29:10 -0500 X-MC-Unique: tFat2-GLNC62fmWmU3vGEw-1 Received: from smtp.corp.redhat.com (int-mx08.intmail.prod.int.rdu2.redhat.com [10.11.54.8]) (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 3903738062A4; Thu, 1 Feb 2024 15:29:10 +0000 (UTC) Received: from localhost (unknown [10.42.28.13]) by smtp.corp.redhat.com (Postfix) with ESMTP id 0658BC2590D; Thu, 1 Feb 2024 15:29:09 +0000 (UTC) From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Update expected error for debug/constexpr*_neg.cc tests Date: Thu, 1 Feb 2024 15:28:52 +0000 Message-ID: <20240201152905.2137594-1-jwakely@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.8 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com X-Spam-Status: No, score=-12.7 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_H2, 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: 1789711070303193487 X-GMAIL-MSGID: 1789711070303193487 Tested x86_64-linux. Pushed to trunk. -- >8 -- We no longer hit a __builtin_unreachable() in these tests, so we need to update the dg-error patterns to match _Error_formatter::_M_error(). We can also remove some dg-prune-output directives matching notes saying "in 'constexpr' expansion" because that's done globally in prune.exp. libstdc++-v3/ChangeLog: * testsuite/25_algorithms/copy/debug/constexpr_neg.cc: Adjust dg-error pattern. * testsuite/25_algorithms/copy_backward/debug/constexpr_neg.cc: Likewise. * testsuite/25_algorithms/equal/debug/constexpr_neg.cc: Likewise. * testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_neg.cc: Likewise. * testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_pred_neg.cc: Likewise. * testsuite/25_algorithms/lower_bound/debug/constexpr_valid_range_neg.cc: Likewise. * testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_neg.cc: Likewise. * testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_pred_neg.cc: Likewise. * testsuite/25_algorithms/upper_bound/debug/constexpr_valid_range_neg.cc: Likewise. --- .../testsuite/25_algorithms/copy/debug/constexpr_neg.cc | 2 +- .../25_algorithms/copy_backward/debug/constexpr_neg.cc | 3 +-- .../testsuite/25_algorithms/equal/debug/constexpr_neg.cc | 2 +- .../lower_bound/debug/constexpr_partitioned_neg.cc | 2 +- .../lower_bound/debug/constexpr_partitioned_pred_neg.cc | 3 +-- .../lower_bound/debug/constexpr_valid_range_neg.cc | 3 +-- .../upper_bound/debug/constexpr_partitioned_neg.cc | 3 +-- .../upper_bound/debug/constexpr_partitioned_pred_neg.cc | 3 +-- .../upper_bound/debug/constexpr_valid_range_neg.cc | 3 +-- 9 files changed, 9 insertions(+), 15 deletions(-) diff --git a/libstdc++-v3/testsuite/25_algorithms/copy/debug/constexpr_neg.cc b/libstdc++-v3/testsuite/25_algorithms/copy/debug/constexpr_neg.cc index 2922d1ab1f9..6ae37b87ac5 100644 --- a/libstdc++-v3/testsuite/25_algorithms/copy/debug/constexpr_neg.cc +++ b/libstdc++-v3/testsuite/25_algorithms/copy/debug/constexpr_neg.cc @@ -33,7 +33,7 @@ test1() } static_assert(test1()); // { dg-error "non-constant condition" } -// { dg-error "builtin_unreachable" "" { target *-*-* } 0 } +// { dg-error "_Error_formatter::_M_error()" "" { target *-*-* } 0 } constexpr bool test2() diff --git a/libstdc++-v3/testsuite/25_algorithms/copy_backward/debug/constexpr_neg.cc b/libstdc++-v3/testsuite/25_algorithms/copy_backward/debug/constexpr_neg.cc index 4b55b835ab4..52259aa50aa 100644 --- a/libstdc++-v3/testsuite/25_algorithms/copy_backward/debug/constexpr_neg.cc +++ b/libstdc++-v3/testsuite/25_algorithms/copy_backward/debug/constexpr_neg.cc @@ -35,5 +35,4 @@ test() static_assert(test()); // { dg-error "non-constant condition" } -// { dg-prune-output "in 'constexpr' expansion" } -// { dg-prune-output "builtin_unreachable" } +// { dg-prune-output "_Error_formatter::_M_error()" } diff --git a/libstdc++-v3/testsuite/25_algorithms/equal/debug/constexpr_neg.cc b/libstdc++-v3/testsuite/25_algorithms/equal/debug/constexpr_neg.cc index 8fb225ecc85..82ec49c6f40 100644 --- a/libstdc++-v3/testsuite/25_algorithms/equal/debug/constexpr_neg.cc +++ b/libstdc++-v3/testsuite/25_algorithms/equal/debug/constexpr_neg.cc @@ -32,7 +32,7 @@ test01() } static_assert(test01()); // { dg-error "non-constant condition" } -// { dg-error "builtin_unreachable" "" { target *-*-* } 0 } +// { dg-error "_Error_formatter::_M_error()" "" { target *-*-* } 0 } constexpr bool test02() diff --git a/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_neg.cc b/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_neg.cc index 184ae22ae24..8c2819d0554 100644 --- a/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_neg.cc +++ b/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_neg.cc @@ -43,5 +43,5 @@ test() static_assert(test()); // { dg-error "" } -// { dg-prune-output "builtin_unreachable" } +// { dg-prune-output "_Error_formatter::_M_error()" } // { dg-prune-output "in 'constexpr'" } diff --git a/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_pred_neg.cc b/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_pred_neg.cc index f7b2b7231d9..ab27cb17fb1 100644 --- a/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_pred_neg.cc +++ b/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_partitioned_pred_neg.cc @@ -33,5 +33,4 @@ test() static_assert(test()); // { dg-error "" } -// { dg-prune-output "builtin_unreachable" } -// { dg-prune-output "in 'constexpr'" } +// { dg-prune-output "_Error_formatter::_M_error()" } diff --git a/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_valid_range_neg.cc b/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_valid_range_neg.cc index 6996950d686..9fd3bcc070d 100644 --- a/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_valid_range_neg.cc +++ b/libstdc++-v3/testsuite/25_algorithms/lower_bound/debug/constexpr_valid_range_neg.cc @@ -46,6 +46,5 @@ test2() static_assert(test2()); // { dg-error "" } -// { dg-prune-output "builtin_unreachable" } -// { dg-prune-output "in 'constexpr'" } +// { dg-prune-output "_Error_formatter::_M_error()" } diff --git a/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_neg.cc b/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_neg.cc index b4e56df9174..c1ee761f51e 100644 --- a/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_neg.cc +++ b/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_neg.cc @@ -43,5 +43,4 @@ test() static_assert(test()); // { dg-error "" } -// { dg-prune-output "builtin_unreachable" } -// { dg-prune-output "in 'constexpr'" } +// { dg-prune-output "_Error_formatter::_M_error()" } diff --git a/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_pred_neg.cc b/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_pred_neg.cc index 1ffeb326bfc..85fcde40b37 100644 --- a/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_pred_neg.cc +++ b/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_partitioned_pred_neg.cc @@ -33,5 +33,4 @@ test() static_assert(test()); // { dg-error "" } -// { dg-prune-output "builtin_unreachable" } -// { dg-prune-output "in 'constexpr'" } +// { dg-prune-output "_Error_formatter::_M_error()" } diff --git a/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_valid_range_neg.cc b/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_valid_range_neg.cc index 5b0e651d077..446073c314b 100644 --- a/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_valid_range_neg.cc +++ b/libstdc++-v3/testsuite/25_algorithms/upper_bound/debug/constexpr_valid_range_neg.cc @@ -46,5 +46,4 @@ test2() static_assert(test2()); // { dg-error "" } -// { dg-prune-output "builtin_unreachable" } -// { dg-prune-output "in 'constexpr'" } +// { dg-prune-output "_Error_formatter::_M_error()" }