From 2d45a18c24c56e8e76138b5b2da47de7656e6e02 Mon Sep 17 00:00:00 2001 From: Howard Hinnant Date: Fri, 3 Jun 2011 18:40:47 +0000 Subject: [PATCH] Bring noexcept for inline with other containers. llvm-svn: 132573 --- libcxx/include/string | 63 +++++++++++++------ .../string.cons/default_noexcept.pass.cpp | 45 +++++++++++++ .../string.cons/dtor_noexcept.pass.cpp | 47 ++++++++++++++ .../string.cons/move_assign_noexcept.pass.cpp | 47 ++++++++++++++ .../string.cons/move_noexcept.pass.cpp | 45 +++++++++++++ .../string.special/swap_noexcept.pass.cpp | 54 ++++++++++++++++ 6 files changed, 283 insertions(+), 18 deletions(-) create mode 100644 libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp create mode 100644 libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp create mode 100644 libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp create mode 100644 libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp create mode 100644 libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp diff --git a/libcxx/include/string b/libcxx/include/string index 29a8c20df9e1..f05fe367cc0a 100644 --- a/libcxx/include/string +++ b/libcxx/include/string @@ -92,9 +92,12 @@ public: static const size_type npos = -1; - explicit basic_string(const allocator_type& a = allocator_type()); + basic_string() + noexcept(is_nothrow_default_constructible::value); + explicit basic_string(const allocator_type& a); basic_string(const basic_string& str); - basic_string(basic_string&& str) noexcept; + basic_string(basic_string&& str) + noexcept(is_nothrow_move_constructible::value); basic_string(const basic_string& str, size_type pos, size_type n = npos, const allocator_type& a = allocator_type()); basic_string(const_pointer s, const allocator_type& a = allocator_type()); @@ -110,7 +113,10 @@ public: ~basic_string(); basic_string& operator=(const basic_string& str); - basic_string& operator=(basic_string&& str); + basic_string& operator=(basic_string&& str) + noexcept( + allocator_type::propagate_on_container_move_assignment::value && + is_nothrow_move_assignable::value); basic_string& operator=(const_pointer s); basic_string& operator=(value_type c); basic_string& operator=(initializer_list); @@ -213,7 +219,9 @@ public: size_type copy(pointer s, size_type n, size_type pos = 0) const; basic_string substr(size_type pos = 0, size_type n = npos) const; - void swap(basic_string& str) noexcept; + void swap(basic_string& str) + noexcept(!allocator_type::propagate_on_container_swap::value || + __is_nothrow_swappable::value) const_pointer c_str() const noexcept; const_pointer data() const noexcept; @@ -344,7 +352,8 @@ bool operator>=(const charT* lhs, const basic_string& template void swap(basic_string& lhs, - basic_string& rhs) noexcept; + basic_string& rhs) + noexcept(noexcept(lhs.swap(rhs))); template basic_istream& @@ -1025,8 +1034,8 @@ public: typedef allocator_traits __alloc_traits; typedef typename __alloc_traits::size_type size_type; typedef typename __alloc_traits::difference_type difference_type; - typedef typename allocator_type::reference reference; - typedef typename allocator_type::const_reference const_reference; + typedef value_type& reference; + typedef const value_type& const_reference; typedef typename __alloc_traits::pointer pointer; typedef typename __alloc_traits::const_pointer const_pointer; #ifdef _LIBCPP_DEBUG @@ -1109,13 +1118,15 @@ private: public: static const size_type npos = -1; - _LIBCPP_INLINE_VISIBILITY basic_string() _NOEXCEPT; + _LIBCPP_INLINE_VISIBILITY basic_string() + _NOEXCEPT_(is_nothrow_default_constructible::value); _LIBCPP_INLINE_VISIBILITY explicit basic_string(const allocator_type& __a); basic_string(const basic_string& __str); basic_string(const basic_string& __str, const allocator_type& __a); #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY - basic_string(basic_string&& __str) _NOEXCEPT; + basic_string(basic_string&& __str) + _NOEXCEPT_(is_nothrow_move_constructible::value); _LIBCPP_INLINE_VISIBILITY basic_string(basic_string&& __str, const allocator_type& __a); #endif // _LIBCPP_HAS_NO_RVALUE_REFERENCES @@ -1148,7 +1159,9 @@ public: basic_string& operator=(const basic_string& __str); #ifndef _LIBCPP_HAS_NO_RVALUE_REFERENCES _LIBCPP_INLINE_VISIBILITY - basic_string& operator=(basic_string&& __str); + basic_string& operator=(basic_string&& __str) + _NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value && + is_nothrow_move_assignable::value); #endif _LIBCPP_INLINE_VISIBILITY basic_string& operator=(const_pointer __s) {return assign(__s);} basic_string& operator=(value_type __c); @@ -1212,7 +1225,7 @@ public: void reserve(size_type res_arg = 0); _LIBCPP_INLINE_VISIBILITY - void shrink_to_fit() {reserve();} + void shrink_to_fit() _NOEXCEPT {reserve();} _LIBCPP_INLINE_VISIBILITY void clear() _NOEXCEPT; _LIBCPP_INLINE_VISIBILITY bool empty() const _NOEXCEPT {return size() == 0;} @@ -1353,7 +1366,9 @@ public: basic_string substr(size_type __pos = 0, size_type __n = npos) const; _LIBCPP_INLINE_VISIBILITY - void swap(basic_string& __str) _NOEXCEPT; + void swap(basic_string& __str) + _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value || + __is_nothrow_swappable::value); _LIBCPP_INLINE_VISIBILITY const_pointer c_str() const _NOEXCEPT {return data();} @@ -1557,16 +1572,20 @@ private: _LIBCPP_INLINE_VISIBILITY void __move_assign(basic_string& __str, false_type); _LIBCPP_INLINE_VISIBILITY - void __move_assign(basic_string& __str, true_type); + void __move_assign(basic_string& __str, true_type) + _NOEXCEPT_(is_nothrow_move_assignable::value); #endif _LIBCPP_INLINE_VISIBILITY - static void __swap_alloc(allocator_type& __x, allocator_type& __y) _NOEXCEPT + static void __swap_alloc(allocator_type& __x, allocator_type& __y) + _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value || + __is_nothrow_swappable::value) {__swap_alloc(__x, __y, integral_constant());} _LIBCPP_INLINE_VISIBILITY - static void __swap_alloc(allocator_type& __x, allocator_type& __y, true_type) _NOEXCEPT + static void __swap_alloc(allocator_type& __x, allocator_type& __y, true_type) + _NOEXCEPT_(__is_nothrow_swappable::value) { using _STD::swap; swap(__x, __y); @@ -1640,7 +1659,8 @@ basic_string<_CharT, _Traits, _Allocator>::__invalidate_iterators_past(size_type template _LIBCPP_INLINE_VISIBILITY inline -basic_string<_CharT, _Traits, _Allocator>::basic_string() _NOEXCEPT +basic_string<_CharT, _Traits, _Allocator>::basic_string() + _NOEXCEPT_(is_nothrow_default_constructible::value) { __zero(); } @@ -1767,7 +1787,8 @@ basic_string<_CharT, _Traits, _Allocator>::basic_string(const basic_string& __st template _LIBCPP_INLINE_VISIBILITY inline -basic_string<_CharT, _Traits, _Allocator>::basic_string(basic_string&& __str) _NOEXCEPT +basic_string<_CharT, _Traits, _Allocator>::basic_string(basic_string&& __str) + _NOEXCEPT_(is_nothrow_move_constructible::value) : __r_(_STD::move(__str.__r_)) { __str.__zero(); @@ -2094,6 +2115,7 @@ template _LIBCPP_INLINE_VISIBILITY inline void basic_string<_CharT, _Traits, _Allocator>::__move_assign(basic_string& __str, true_type) + _NOEXCEPT_(is_nothrow_move_assignable::value) { clear(); shrink_to_fit(); @@ -2105,6 +2127,8 @@ template _LIBCPP_INLINE_VISIBILITY inline basic_string<_CharT, _Traits, _Allocator>& basic_string<_CharT, _Traits, _Allocator>::operator=(basic_string&& __str) + _NOEXCEPT_(__alloc_traits::propagate_on_container_move_assignment::value && + is_nothrow_move_assignable::value) { __move_assign(__str, integral_constant()); @@ -2977,6 +3001,8 @@ template _LIBCPP_INLINE_VISIBILITY inline void basic_string<_CharT, _Traits, _Allocator>::swap(basic_string& __str) + _NOEXCEPT_(!__alloc_traits::propagate_on_container_swap::value || + __is_nothrow_swappable::value) { _STD::swap(__r_.first(), __str.__r_.first()); __swap_alloc(__alloc(), __str.__alloc()); @@ -3853,7 +3879,8 @@ template _LIBCPP_INLINE_VISIBILITY inline void swap(basic_string<_CharT, _Traits, _Allocator>& __lhs, - basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT + basic_string<_CharT, _Traits, _Allocator>& __rhs) + _NOEXCEPT_(_NOEXCEPT_(__lhs.swap(__rhs))) { __lhs.swap(__rhs); } diff --git a/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp new file mode 100644 index 000000000000..ed68c93c7f3a --- /dev/null +++ b/libcxx/test/strings/basic.string/string.cons/default_noexcept.pass.cpp @@ -0,0 +1,45 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// basic_string() +// noexcept(is_nothrow_default_constructible::value); + +// This tests a conforming extension + +#include +#include + +#include "../test_allocator.h" + +template +struct some_alloc +{ + typedef T value_type; + some_alloc(const some_alloc&); +}; + +int main() +{ +#if __has_feature(cxx_noexcept) + { + typedef std::string C; + static_assert(std::is_nothrow_default_constructible::value, ""); + } + { + typedef std::basic_string, test_allocator> C; + static_assert(std::is_nothrow_default_constructible::value, ""); + } + { + typedef std::basic_string, some_alloc> C; + static_assert(!std::is_nothrow_default_constructible::value, ""); + } +#endif +} diff --git a/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp new file mode 100644 index 000000000000..c4550833fb22 --- /dev/null +++ b/libcxx/test/strings/basic.string/string.cons/dtor_noexcept.pass.cpp @@ -0,0 +1,47 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// ~basic_string() // implied noexcept; + +#include +#include + +#include "../test_allocator.h" + +#if __has_feature(cxx_noexcept) + +template +struct some_alloc +{ + typedef T value_type; + some_alloc(const some_alloc&); + ~some_alloc() noexcept(false); +}; + +#endif + +int main() +{ +#if __has_feature(cxx_noexcept) + { + typedef std::string C; + static_assert(std::is_nothrow_destructible::value, ""); + } + { + typedef std::basic_string, test_allocator> C; + static_assert(std::is_nothrow_destructible::value, ""); + } + { + typedef std::basic_string, some_alloc> C; + static_assert(!std::is_nothrow_destructible::value, ""); + } +#endif +} diff --git a/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp new file mode 100644 index 000000000000..fdcf4785fbc4 --- /dev/null +++ b/libcxx/test/strings/basic.string/string.cons/move_assign_noexcept.pass.cpp @@ -0,0 +1,47 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// basic_string& operator=(basic_string&& c) +// noexcept( +// allocator_type::propagate_on_container_move_assignment::value && +// is_nothrow_move_assignable::value); + +// This tests a conforming extension + +#include +#include + +#include "../test_allocator.h" + +template +struct some_alloc +{ + typedef T value_type; + some_alloc(const some_alloc&); +}; + +int main() +{ +#if __has_feature(cxx_noexcept) + { + typedef std::string C; + static_assert(std::is_nothrow_move_assignable::value, ""); + } + { + typedef std::basic_string, test_allocator> C; + static_assert(!std::is_nothrow_move_assignable::value, ""); + } + { + typedef std::basic_string, some_alloc> C; + static_assert(!std::is_nothrow_move_assignable::value, ""); + } +#endif +} diff --git a/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp new file mode 100644 index 000000000000..42e828b88383 --- /dev/null +++ b/libcxx/test/strings/basic.string/string.cons/move_noexcept.pass.cpp @@ -0,0 +1,45 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// basic_string(basic_string&&) +// noexcept(is_nothrow_move_constructible::value); + +// This tests a conforming extension + +#include +#include + +#include "../test_allocator.h" + +template +struct some_alloc +{ + typedef T value_type; + some_alloc(const some_alloc&); +}; + +int main() +{ +#if __has_feature(cxx_noexcept) + { + typedef std::string C; + static_assert(std::is_nothrow_move_constructible::value, ""); + } + { + typedef std::basic_string, test_allocator> C; + static_assert(std::is_nothrow_move_constructible::value, ""); + } + { + typedef std::basic_string, some_alloc> C; + static_assert(!std::is_nothrow_move_constructible::value, ""); + } +#endif +} diff --git a/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp new file mode 100644 index 000000000000..01767e48e84e --- /dev/null +++ b/libcxx/test/strings/basic.string/string.nonmembers/string.special/swap_noexcept.pass.cpp @@ -0,0 +1,54 @@ +//===----------------------------------------------------------------------===// +// +// The LLVM Compiler Infrastructure +// +// This file is dual licensed under the MIT and the University of Illinois Open +// Source Licenses. See LICENSE.TXT for details. +// +//===----------------------------------------------------------------------===// + +// + +// void swap(basic_string& c) +// noexcept(!allocator_type::propagate_on_container_swap::value || +// __is_nothrow_swappable::value); + +// This tests a conforming extension + +#include +#include + +#include "../../test_allocator.h" + +template +struct some_alloc +{ + typedef T value_type; + + some_alloc() {} + some_alloc(const some_alloc&); + void deallocate(void*, unsigned) {} + + typedef std::true_type propagate_on_container_swap; +}; + +int main() +{ +#if __has_feature(cxx_noexcept) + { + typedef std::string C; + C c1, c2; + static_assert(noexcept(swap(c1, c2)), ""); + } + { + typedef std::basic_string, test_allocator> C; + C c1, c2; + static_assert(noexcept(swap(c1, c2)), ""); + } + { + typedef std::basic_string, some_alloc> C; + C c1, c2; + static_assert(!noexcept(swap(c1, c2)), ""); + } +#endif +}