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 758553857C7D for ; Sat, 31 Oct 2020 00:21:52 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.3.2 sourceware.org 758553857C7D 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-587-aASLi8E1MB28NqWwuiUXEg-1; Fri, 30 Oct 2020 20:21:49 -0400 X-MC-Unique: aASLi8E1MB28NqWwuiUXEg-1 Received: from smtp.corp.redhat.com (int-mx01.intmail.prod.int.phx2.redhat.com [10.5.11.11]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 63BE1186DD22; Sat, 31 Oct 2020 00:21:48 +0000 (UTC) Received: from localhost (unknown [10.33.36.7]) by smtp.corp.redhat.com (Postfix) with ESMTP id 10F475B4B2; Sat, 31 Oct 2020 00:21:47 +0000 (UTC) Date: Sat, 31 Oct 2020 00:21:47 +0000 From: Jonathan Wakely To: libstdc++@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [committed] libstdc++: Fix some more warnings in test Message-ID: <20201031002147.GA2676789@redhat.com> MIME-Version: 1.0 X-Clacks-Overhead: GNU Terry Pratchett X-Scanned-By: MIMEDefang 2.79 on 10.5.11.11 X-Mimecast-Spam-Score: 0 X-Mimecast-Originator: redhat.com Content-Type: multipart/mixed; boundary="5mCyUwZo2JvN/JJP" Content-Disposition: inline X-Spam-Status: No, score=-14.2 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_H4, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) 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: Sat, 31 Oct 2020 00:21:53 -0000 --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset=us-ascii Content-Disposition: inline libstdc++-v3/ChangeLog: * testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Avoid -Wcatch-value warnings. Tested powerpc64le-linux. Committed to trunk. --5mCyUwZo2JvN/JJP Content-Type: text/plain; charset=us-ascii Content-Disposition: attachment; filename="patch.txt" commit d1e5d82af819025df9d9a81e8c591690e299924a Author: Jonathan Wakely Date: Fri Oct 30 10:47:25 2020 libstdc++: Fix some more warnings in test libstdc++-v3/ChangeLog: * testsuite/23_containers/vector/bool/modifiers/insert/31370.cc: Avoid -Wcatch-value warnings. diff --git a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc index 36d681528650..5a714873f0d7 100644 --- a/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc +++ b/libstdc++-v3/testsuite/23_containers/vector/bool/modifiers/insert/31370.cc @@ -59,14 +59,14 @@ void test01() { } catch(std::exception&) { ++myexit; } - + // When doubling is too big, but smaller is sufficient, the resize // should do smaller and be happy. It certainly shouldn't throw // other exceptions or crash. try { std::vector x; - x.resize(x.max_size() / 2 + 1, false); + x.resize(x.max_size() / 2 + 1, false); for(int i = 0; i < _S_word_bit; ++i) x.push_back(false); check_cap_ge_size(x); @@ -75,11 +75,11 @@ void test01() { } catch(std::exception&) { ++myexit; } - + try { std::vector x; - x.resize(x.max_size() / 2 + 1, false); + x.resize(x.max_size() / 2 + 1, false); x.insert(x.end(), _S_word_bit, false); check_cap_ge_size(x); } @@ -87,11 +87,11 @@ void test01() { } catch(std::exception&) { ++myexit; } - + try { std::vector x; - x.resize(x.max_size() / 2 + 1, false); + x.resize(x.max_size() / 2 + 1, false); std::vector y(_S_word_bit, false); x.insert(x.end(), y.begin(), y.end()); check_cap_ge_size(x); @@ -106,7 +106,7 @@ void test01() try { std::vector x; - x.resize(x.max_size() - _S_word_bit, false); + x.resize(x.max_size() - _S_word_bit, false); for(int i = 0; i < _S_word_bit; ++i) x.push_back(false); check_cap_ge_size(x); @@ -115,11 +115,11 @@ void test01() { } catch(std::exception&) { ++myexit; } - + try { std::vector x; - x.resize(x.max_size() - _S_word_bit, false); + x.resize(x.max_size() - _S_word_bit, false); x.insert(x.end(), _S_word_bit, false); check_cap_ge_size(x); } @@ -131,7 +131,7 @@ void test01() try { std::vector x; - x.resize(x.max_size() - _S_word_bit, false); + x.resize(x.max_size() - _S_word_bit, false); std::vector y(_S_word_bit, false); x.insert(x.end(), y.begin(), y.end()); check_cap_ge_size(x); @@ -140,51 +140,51 @@ void test01() { } catch(std::exception&) { ++myexit; } - + // Attempts to put in more than max_size() items should result in a // length error. try { std::vector x; - x.resize(x.max_size() - _S_word_bit, false); + x.resize(x.max_size() - _S_word_bit, false); for(int i = 0; i < _S_word_bit + 1; ++i) x.push_back(false); ++myexit; } - catch(std::bad_alloc) + catch(std::bad_alloc&) { } - catch(std::length_error) + catch(std::length_error&) { } - catch(std::exception) - { ++myexit; } - - try - { - std::vector x; - x.resize(x.max_size() - _S_word_bit, false); - x.insert(x.end(), _S_word_bit + 1, false); - ++myexit; - } - catch(std::bad_alloc) - { } - catch(std::length_error) - { } - catch(std::exception) + catch(std::exception&) { ++myexit; } try { std::vector x; - x.resize(x.max_size() - _S_word_bit, false); + x.resize(x.max_size() - _S_word_bit, false); + x.insert(x.end(), _S_word_bit + 1, false); + ++myexit; + } + catch(std::bad_alloc&) + { } + catch(std::length_error&) + { } + catch(std::exception&) + { ++myexit; } + + try + { + std::vector x; + x.resize(x.max_size() - _S_word_bit, false); std::vector y(_S_word_bit + 1, false); x.insert(x.end(), y.begin(), y.end()); ++myexit; } - catch(std::bad_alloc) + catch(std::bad_alloc&) { } - catch(std::length_error) + catch(std::length_error&) { } - catch(std::exception) + catch(std::exception&) { ++myexit; } VERIFY( !myexit ); --5mCyUwZo2JvN/JJP--