From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 1734) id B33263858D39; Fri, 2 Dec 2022 20:07:52 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B33263858D39 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1670011672; bh=JqML0sDPd8Py+BwlIlYMH0fmk1XdAe7kGGBgk5QjUto=; h=From:To:Subject:Date:From; b=VNzKggMVMbpgUGvDJqL9z6tNhDpu2aBm2cACC86vuMlUu9zULQ4L0haRNMFsP281/ 2xljP29tqUSvJIaSpHg6tNe8xGoSpx61rFtGiM0JQMWQ/BbGZCv5S18/mluxsJBY8H 8Uh1oDS/GsGFNM9IGIzSvEKRzKP05fpN7Q/lcEW8= MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="utf-8" From: Marek Polacek To: gcc-cvs@gcc.gnu.org Subject: [gcc r13-4470] testsuite: Adjust dg-error for -fimplicit-constexpr X-Act-Checkin: gcc X-Git-Author: Marek Polacek X-Git-Refname: refs/heads/trunk X-Git-Oldrev: d19aa6af6634b1e97f38431ad091f3b3f12baf2f X-Git-Newrev: 1998db0fa1f78e373c88daea8bb339d32b41e6aa Message-Id: <20221202200752.B33263858D39@sourceware.org> Date: Fri, 2 Dec 2022 20:07:52 +0000 (GMT) List-Id: https://gcc.gnu.org/g:1998db0fa1f78e373c88daea8bb339d32b41e6aa commit r13-4470-g1998db0fa1f78e373c88daea8bb339d32b41e6aa Author: Marek Polacek Date: Fri Dec 2 14:43:26 2022 -0500 testsuite: Adjust dg-error for -fimplicit-constexpr Some of the new tests were failing with -fimplicit-constexpr. This patch adjusts the expected diagnostic. Tested with GXX_TESTSUITE_STDS=98,11,14,17,20,23 make check-c++ RUNTESTFLAGS="--target_board=unix\{,-fimplicit-constexpr\} dg.exp=spaceship-eq3.C" gcc/testsuite/ChangeLog: * g++.dg/cpp0x/constexpr-ex1.C: Adjust dg-error. * g++.dg/cpp23/constexpr-nonlit10.C: Adjust dg-warning. * g++.dg/cpp23/constexpr-nonlit11.C: Likewise. * g++.dg/cpp2a/spaceship-eq3.C: Add dg-error. Diff: --- gcc/testsuite/g++.dg/cpp0x/constexpr-ex1.C | 6 +++--- gcc/testsuite/g++.dg/cpp23/constexpr-nonlit10.C | 4 ++-- gcc/testsuite/g++.dg/cpp23/constexpr-nonlit11.C | 4 ++-- gcc/testsuite/g++.dg/cpp2a/spaceship-eq3.C | 1 + 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-ex1.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-ex1.C index 48281a47784..383d38a42d4 100644 --- a/gcc/testsuite/g++.dg/cpp0x/constexpr-ex1.C +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-ex1.C @@ -87,8 +87,8 @@ struct resource { } }; constexpr resource f(resource d) -{ return d; } // { dg-error "non-.constexpr." "" { target { { ! implicit_constexpr } && c++20_down } } } -// { dg-error "non-.constexpr." "" { target c++23 } .-2 } -constexpr resource d = f(9); // { dg-message ".constexpr." "" { target { ! implicit_constexpr } } } +{ return d; } // { dg-error "non-.constexpr." "" { target { { { ! implicit_constexpr } && c++20_down } || c++11_only } } } +// { dg-error "non-.constexpr." "" { target { c++23 && { ! implicit_constexpr } } } .-2 } +constexpr resource d = f(9); // { dg-message ".constexpr." "" { target { { ! implicit_constexpr } || c++11_only } } } // 4.4 floating-point constant expressions diff --git a/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit10.C b/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit10.C index 48706f7b66e..31d4b873bbf 100644 --- a/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit10.C +++ b/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit10.C @@ -11,13 +11,13 @@ struct NonLiteral { // C++23: It is possible to write a constexpr function for which no // invocation satisfies the requirements of a core constant expression. constexpr NonLiteral -fn0 (int) // { dg-warning "invalid return type" } +fn0 (int) // { dg-warning "invalid return type" "" { target { ! implicit_constexpr } } } { return NonLiteral{}; } constexpr int -fn1 (NonLiteral) // { dg-warning "invalid type" } +fn1 (NonLiteral) // { dg-warning "invalid type" "" { target { ! implicit_constexpr } } } { return 42; } diff --git a/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit11.C b/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit11.C index a7114bc66cb..e08809f873c 100644 --- a/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit11.C +++ b/gcc/testsuite/g++.dg/cpp23/constexpr-nonlit11.C @@ -25,10 +25,10 @@ struct X { struct S { X x; // Calls a non-constexpr constructor X::X(int). - constexpr S(int i) : x(i) { } // { dg-warning "call to" } + constexpr S(int i) : x(i) { } // { dg-warning "call to" "" { target { ! implicit_constexpr } } } S(int, int) { } // Target constructor isn't constexpr. - constexpr S() : S(42, 42) { } // { dg-warning "call to" } + constexpr S() : S(42, 42) { } // { dg-warning "call to" "" { target { ! implicit_constexpr } } } }; namespace N1 { diff --git a/gcc/testsuite/g++.dg/cpp2a/spaceship-eq3.C b/gcc/testsuite/g++.dg/cpp2a/spaceship-eq3.C index 69eaa7b9b20..246839f1f95 100644 --- a/gcc/testsuite/g++.dg/cpp2a/spaceship-eq3.C +++ b/gcc/testsuite/g++.dg/cpp2a/spaceship-eq3.C @@ -9,6 +9,7 @@ struct D A i; bool operator==(const D& x) const = default; // { dg-error "A::operator==" "" { target c++20_down } } bool operator!=(const D& z) const = default; // { dg-error "D::operator==" "" { target c++20_down } } +// { dg-error "called" "" { target { c++23 && implicit_constexpr } } .-1 } }; constexpr D d{A()};