From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 72666 invoked by alias); 30 Jan 2020 20:50:06 -0000 Mailing-List: contact gcc-cvs-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Archive: List-Post: List-Help: Sender: gcc-cvs-owner@gcc.gnu.org Received: (qmail 72646 invoked by uid 9071); 30 Jan 2020 20:50:06 -0000 Date: Thu, 30 Jan 2020 20:50:00 -0000 Message-ID: <20200130205006.72645.qmail@sourceware.org> Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jakub Jelinek To: gcc-cvs@gcc.gnu.org Subject: [gcc(refs/vendors/redhat/heads/gcc-10-branch)] c++: Testsuite adjustments for PR 90992. X-Act-Checkin: gcc X-Git-Author: Jason Merrill X-Git-Refname: refs/vendors/redhat/heads/gcc-10-branch X-Git-Oldrev: 5035cd662459b09605370f2ba41b2238119c69b1 X-Git-Newrev: 40bf3f1fd058028988b2625f89efe6bb811a4185 X-SW-Source: 2020-01/txt/msg04723.txt.bz2 https://gcc.gnu.org/g:40bf3f1fd058028988b2625f89efe6bb811a4185 commit 40bf3f1fd058028988b2625f89efe6bb811a4185 Author: Jason Merrill Date: Sun Jan 26 21:34:33 2020 -0500 c++: Testsuite adjustments for PR 90992. It occurred to me that the NotNoexcept class is irrelevant to the issue I was fixing, so let's remove it. Diff: --- gcc/testsuite/g++.dg/cpp0x/noexcept03.C | 2 +- gcc/testsuite/g++.dg/cpp0x/noexcept09.C | 2 +- gcc/testsuite/g++.dg/warn/Wnoexcept1.C | 3 +-- gcc/testsuite/g++.dg/warn/Wnoexcept1.h | 12 ------------ 4 files changed, 3 insertions(+), 16 deletions(-) diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept03.C b/gcc/testsuite/g++.dg/cpp0x/noexcept03.C index 906a44d..b25e732 100644 --- a/gcc/testsuite/g++.dg/cpp0x/noexcept03.C +++ b/gcc/testsuite/g++.dg/cpp0x/noexcept03.C @@ -35,7 +35,7 @@ void f2(T a) noexcept (noexcept (f (a))) f(a); } -struct A { A() { } }; // { dg-warning "does not throw" } +struct A { A() { } }; // { dg-message "does not throw" } int main() { diff --git a/gcc/testsuite/g++.dg/cpp0x/noexcept09.C b/gcc/testsuite/g++.dg/cpp0x/noexcept09.C index d26a3ae..bda7269 100644 --- a/gcc/testsuite/g++.dg/cpp0x/noexcept09.C +++ b/gcc/testsuite/g++.dg/cpp0x/noexcept09.C @@ -3,7 +3,7 @@ // { dg-options "-Wnoexcept" } template -T f (T t) { return t; } // { dg-warning "does not throw" } +T f (T t) { return t; } // { dg-message "does not throw" } #define SA(X) static_assert(X, #X) diff --git a/gcc/testsuite/g++.dg/warn/Wnoexcept1.C b/gcc/testsuite/g++.dg/warn/Wnoexcept1.C index e3a5df6..93210de 100644 --- a/gcc/testsuite/g++.dg/warn/Wnoexcept1.C +++ b/gcc/testsuite/g++.dg/warn/Wnoexcept1.C @@ -7,7 +7,7 @@ // We expect a warning at the declaration of construct2, since Automatic2 is // defined below; we don't expect one for construct1, because Automatic1 is // defined in the fake system header. -// { dg-warning "noexcept-expression" "" { target *-*-* } 26 } +// { dg-warning "noexcept-expression" "" { target *-*-* } 15 } class Automatic2 { public: @@ -15,7 +15,6 @@ public: private: size_t Bla; - NotNoexcept Dummy; }; union U diff --git a/gcc/testsuite/g++.dg/warn/Wnoexcept1.h b/gcc/testsuite/g++.dg/warn/Wnoexcept1.h index f59733e..8843ab4 100644 --- a/gcc/testsuite/g++.dg/warn/Wnoexcept1.h +++ b/gcc/testsuite/g++.dg/warn/Wnoexcept1.h @@ -4,17 +4,6 @@ using size_t = decltype(sizeof(42)); inline void * operator new (size_t, void *p) noexcept { return p; } -class NotNoexcept { -public: - NotNoexcept() noexcept(false) {} - NotNoexcept(const NotNoexcept&) noexcept(false) {} - NotNoexcept(NotNoexcept &&) noexcept(false) {} - ~NotNoexcept() noexcept(false) {} - - NotNoexcept&operator=(const NotNoexcept&) noexcept(false) { return *this;} - NotNoexcept&operator=(NotNoexcept &&) noexcept(false) {return *this;} -}; - template void construct1(_Up* __p, _Args... __args) @@ -33,5 +22,4 @@ public: private: size_t Bla; - NotNoexcept Dummy; };