From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [216.205.24.124]) by sourceware.org (Postfix) with ESMTP id 91FED3857426 for ; Tue, 12 Oct 2021 15:50:28 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 91FED3857426 Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-149-37ztvwbFNqOrFGzmGgaZfg-1; Tue, 12 Oct 2021 11:50:26 -0400 X-MC-Unique: 37ztvwbFNqOrFGzmGgaZfg-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.phx2.redhat.com [10.5.11.14]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id CDA4280572F; Tue, 12 Oct 2021 15:50:25 +0000 (UTC) Received: from localhost (unknown [10.33.37.32]) by smtp.corp.redhat.com (Postfix) with ESMTP id 64B485D9C6; Tue, 12 Oct 2021 15:50:25 +0000 (UTC) Date: Tue, 12 Oct 2021 16:50:24 +0100 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix test that fails for C++20 Message-ID: MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.14 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="73B5LpR2Rm9GED0O" Content-Disposition: inline X-Spam-Status: No, score=-13.6 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_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_NONE, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on server2.sourceware.org X-BeenThere: libstdc++@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Libstdc++ mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 12 Oct 2021 15:50:29 -0000 --73B5LpR2Rm9GED0O Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Also restore the test for 'a < a' that was removed by r12-2537 because it is ill-formed. We still want to test operator< for tuple, we just need to not use std::nullptr_t in that tuple type. libstdc++-v3/ChangeLog: * testsuite/20_util/tuple/comparison_operators/overloaded.cc: Restore test for operator<. * testsuite/20_util/tuple/comparison_operators/overloaded2.cc: Adjust expected errors for C++20. Tested powerpc64le-linux. Committed to trunk. --73B5LpR2Rm9GED0O Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit 727137d6ca6d3d401a0c1b4df6b9aae8b97dacd5 Author: Jonathan Wakely Date: Tue Oct 12 15:39:18 2021 libstdc++: Fix test that fails for C++20 Also restore the test for 'a < a' that was removed by r12-2537 because it is ill-formed. We still want to test operator< for tuple, we just need to not use std::nullptr_t in that tuple type. libstdc++-v3/ChangeLog: * testsuite/20_util/tuple/comparison_operators/overloaded.cc: Restore test for operator<. * testsuite/20_util/tuple/comparison_operators/overloaded2.cc: Adjust expected errors for C++20. diff --git a/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/overloaded.cc b/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/overloaded.cc index ef90b6b5b73..a9bc2c7dfb5 100644 --- a/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/overloaded.cc +++ b/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/overloaded.cc @@ -48,3 +48,9 @@ TwistedLogic operator<(const Compares&, const Compares&) { return {false}; } auto a = std::make_tuple(nullptr, Compares{}, 2, 'U'); auto b = a == a; + +#if ! __cpp_lib_three_way_comparison +// Not valid in C++20, because TwistedLogic doesn't model boolean-testable. +auto c = std::make_tuple("", Compares{}, 2, 'U'); +auto d = c < c; +#endif diff --git a/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/overloaded2.cc b/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/overloaded2.cc index a66a9315902..bac16ffd521 100644 --- a/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/overloaded2.cc +++ b/libstdc++-v3/testsuite/20_util/tuple/comparison_operators/overloaded2.cc @@ -49,5 +49,7 @@ TwistedLogic operator<(const Compares&, const Compares&) { return {false}; } auto a = std::make_tuple(nullptr, Compares{}, 2, 'U'); auto b = a < a; -// { dg-error "ordered comparison" "" { target *-*-* } 0 } +// { dg-error "no match for 'operator<'" "" { target c++20 } 0 } +// { dg-error "no match for .*_Synth3way|in requirements" "" { target c++20 } 0 } +// { dg-error "ordered comparison" "" { target c++17_down } 0 } // { dg-error "not a return-statement" "" { target c++11_only } 0 } --73B5LpR2Rm9GED0O--