From: Jonathan Wakely Date: Wed, 5 Oct 2016 12:01:51 +0000 (+0100) Subject: 77864 Fix noexcept conditions for map/set default constructors X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a2a64b499a0251618fc156cc70c31a9692d079be;p=gcc.git 77864 Fix noexcept conditions for map/set default constructors PR libstdc++/77864 * include/bits/stl_map.h (map::map()): Use nothrow constructibility of comparison function in conditional noexcept. * include/bits/stl_multimap.h (multimap::multimap()): Likewise. * include/bits/stl_multiset.h (multiset::multiset()): Likewise. * include/bits/stl_set.h (set::set()): Likewise. * testsuite/23_containers/map/cons/noexcept_default_construct.cc: New test. * testsuite/23_containers/multimap/cons/noexcept_default_construct.cc: Likewise. * testsuite/23_containers/multiset/cons/noexcept_default_construct.cc: Likewise. * testsuite/23_containers/set/cons/noexcept_default_construct.cc: Likewise. From-SVN: r240780 --- diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 1499faf8011..57c887dd1cc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,5 +1,20 @@ 2016-10-05 Jonathan Wakely + PR libstdc++/77864 + * include/bits/stl_map.h (map::map()): Use nothrow constructibility + of comparison function in conditional noexcept. + * include/bits/stl_multimap.h (multimap::multimap()): Likewise. + * include/bits/stl_multiset.h (multiset::multiset()): Likewise. + * include/bits/stl_set.h (set::set()): Likewise. + * testsuite/23_containers/map/cons/noexcept_default_construct.cc: + New test. + * testsuite/23_containers/multimap/cons/noexcept_default_construct.cc: + Likewise. + * testsuite/23_containers/multiset/cons/noexcept_default_construct.cc: + Likewise. + * testsuite/23_containers/set/cons/noexcept_default_construct.cc: + Likewise. + * include/bits/node_handle.h (_Node_handle): Remove invalid and unused alias declaration. diff --git a/libstdc++-v3/include/bits/stl_map.h b/libstdc++-v3/include/bits/stl_map.h index 9a0454aa583..e5b2a1b6b92 100644 --- a/libstdc++-v3/include/bits/stl_map.h +++ b/libstdc++-v3/include/bits/stl_map.h @@ -168,9 +168,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * @brief Default constructor creates no elements. */ map() -#if __cplusplus >= 201103L - noexcept(is_nothrow_default_constructible::value) -#endif + _GLIBCXX_NOEXCEPT_IF( + is_nothrow_default_constructible::value + && is_nothrow_default_constructible::value) : _M_t() { } /** diff --git a/libstdc++-v3/include/bits/stl_multimap.h b/libstdc++-v3/include/bits/stl_multimap.h index c794b9bec4e..d24042767df 100644 --- a/libstdc++-v3/include/bits/stl_multimap.h +++ b/libstdc++-v3/include/bits/stl_multimap.h @@ -165,9 +165,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * @brief Default constructor creates no elements. */ multimap() -#if __cplusplus >= 201103L - noexcept(is_nothrow_default_constructible::value) -#endif + _GLIBCXX_NOEXCEPT_IF( + is_nothrow_default_constructible::value + && is_nothrow_default_constructible::value) : _M_t() { } /** diff --git a/libstdc++-v3/include/bits/stl_multiset.h b/libstdc++-v3/include/bits/stl_multiset.h index d3219ebf083..cc068a9981f 100644 --- a/libstdc++-v3/include/bits/stl_multiset.h +++ b/libstdc++-v3/include/bits/stl_multiset.h @@ -145,9 +145,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * @brief Default constructor creates no elements. */ multiset() -#if __cplusplus >= 201103L - noexcept(is_nothrow_default_constructible::value) -#endif + _GLIBCXX_NOEXCEPT_IF( + is_nothrow_default_constructible::value + && is_nothrow_default_constructible::value) : _M_t() { } /** diff --git a/libstdc++-v3/include/bits/stl_set.h b/libstdc++-v3/include/bits/stl_set.h index 140db39c9f6..39383514385 100644 --- a/libstdc++-v3/include/bits/stl_set.h +++ b/libstdc++-v3/include/bits/stl_set.h @@ -148,9 +148,9 @@ _GLIBCXX_BEGIN_NAMESPACE_CONTAINER * @brief Default constructor creates no elements. */ set() -#if __cplusplus >= 201103L - noexcept(is_nothrow_default_constructible::value) -#endif + _GLIBCXX_NOEXCEPT_IF( + is_nothrow_default_constructible::value + && is_nothrow_default_constructible::value) : _M_t() { } /** diff --git a/libstdc++-v3/testsuite/23_containers/map/cons/noexcept_default_construct.cc b/libstdc++-v3/testsuite/23_containers/map/cons/noexcept_default_construct.cc new file mode 100644 index 00000000000..1286d37a119 --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/map/cons/noexcept_default_construct.cc @@ -0,0 +1,32 @@ +// Copyright (C) 2016 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-do compile { target c++11 } } + +#include + +using mtype1 = std::map; +static_assert(std::is_nothrow_default_constructible::value, "Error"); + +struct cmp +{ + cmp() { } + bool operator()(int, int) const; +}; + +using mtype2 = std::map; +static_assert( !std::is_nothrow_default_constructible::value, "Error"); diff --git a/libstdc++-v3/testsuite/23_containers/multimap/cons/noexcept_default_construct.cc b/libstdc++-v3/testsuite/23_containers/multimap/cons/noexcept_default_construct.cc new file mode 100644 index 00000000000..30c0656956a --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/multimap/cons/noexcept_default_construct.cc @@ -0,0 +1,32 @@ +// Copyright (C) 2016 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-do compile { target c++11 } } + +#include + +using mtype1 = std::multimap; +static_assert(std::is_nothrow_default_constructible::value, "Error"); + +struct cmp +{ + cmp() { } + bool operator()(int, int) const; +}; + +using mtype2 = std::multimap; +static_assert( !std::is_nothrow_default_constructible::value, "Error"); diff --git a/libstdc++-v3/testsuite/23_containers/multiset/cons/noexcept_default_construct.cc b/libstdc++-v3/testsuite/23_containers/multiset/cons/noexcept_default_construct.cc new file mode 100644 index 00000000000..d42fcd5e17a --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/multiset/cons/noexcept_default_construct.cc @@ -0,0 +1,32 @@ +// Copyright (C) 2016 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-do compile { target c++11 } } + +#include + +using stype1 = std::multiset; +static_assert(std::is_nothrow_default_constructible::value, "Error"); + +struct cmp +{ + cmp() { } + bool operator()(int, int) const; +}; + +using stype2 = std::multiset; +static_assert( !std::is_nothrow_default_constructible::value, "Error"); diff --git a/libstdc++-v3/testsuite/23_containers/set/cons/noexcept_default_construct.cc b/libstdc++-v3/testsuite/23_containers/set/cons/noexcept_default_construct.cc new file mode 100644 index 00000000000..7aba0069f5c --- /dev/null +++ b/libstdc++-v3/testsuite/23_containers/set/cons/noexcept_default_construct.cc @@ -0,0 +1,32 @@ +// Copyright (C) 2016 Free Software Foundation, Inc. +// +// This file is part of the GNU ISO C++ Library. This library is free +// software; you can redistribute it and/or modify it under the +// terms of the GNU General Public License as published by the +// Free Software Foundation; either version 3, or (at your option) +// any later version. + +// This library is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. + +// You should have received a copy of the GNU General Public License along +// with this library; see the file COPYING3. If not see +// . + +// { dg-do compile { target c++11 } } + +#include + +using stype1 = std::set; +static_assert(std::is_nothrow_default_constructible::value, "Error"); + +struct cmp +{ + cmp() { } + bool operator()(int, int) const; +}; + +using stype2 = std::set; +static_assert( !std::is_nothrow_default_constructible::value, "Error");