From 9d0bb2ea718b444970519eb7faae8123c282501d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Fran=C3=A7ois=20Dumont?= Date: Mon, 20 Jan 2014 21:15:13 +0000 Subject: [PATCH] create_testsuite_files: Add testsuite/experimental in the list of folders to search for tests. MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit 2014-01-20 François Dumont * scripts/create_testsuite_files: Add testsuite/experimental in the list of folders to search for tests. * include/experimental/string_view (basic_string_view<>::operator[]): Comment _GLIBCXX_DEBUG_ASSERT, incompatible with constexpr qualifier. (basic_string_view<>::front()): Likewise. (basic_string_view<>::back()): Likewise. * testsuite/experimental/string_view/element_access/wchar_t/2.cc: Merge dg-options directives into one. * testsuite/experimental/string_view/element_access/char/2.cc: Likewise. Remove invalid experimental namespace scope on string_view_type. From-SVN: r206859 --- libstdc++-v3/ChangeLog | 15 +++++++++++++++ libstdc++-v3/include/experimental/string_view | 9 ++++++--- .../string_view/element_access/char/2.cc | 5 ++--- .../string_view/element_access/wchar_t/2.cc | 3 +-- 4 files changed, 24 insertions(+), 8 deletions(-) diff --git a/libstdc++-v3/ChangeLog b/libstdc++-v3/ChangeLog index 32f3f36a91b8..c25e0f31b5cc 100644 --- a/libstdc++-v3/ChangeLog +++ b/libstdc++-v3/ChangeLog @@ -1,3 +1,18 @@ +2014-01-20 François Dumont + + * scripts/create_testsuite_files: Add testsuite/experimental in + the list of folders to search for tests. + * include/experimental/string_view + (basic_string_view<>::operator[]): Comment _GLIBCXX_DEBUG_ASSERT, + incompatible with constexpr qualifier. + (basic_string_view<>::front()): Likewise. + (basic_string_view<>::back()): Likewise. + * testsuite/experimental/string_view/element_access/wchar_t/2.cc: + Merge dg-options directives into one. + * testsuite/experimental/string_view/element_access/char/2.cc: + Likewise. Remove invalid experimental namespace scope on + string_view_type. + 2014-01-20 Jonathan Wakely PR libstdc++/56267 diff --git a/libstdc++-v3/include/experimental/string_view b/libstdc++-v3/include/experimental/string_view index 806adcdf91b9..ab6943d806bc 100644 --- a/libstdc++-v3/include/experimental/string_view +++ b/libstdc++-v3/include/experimental/string_view @@ -181,7 +181,8 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION constexpr const _CharT& operator[](size_type __pos) const { - _GLIBCXX_DEBUG_ASSERT(__pos <= this->_M_len); + // TODO: Assert to restore in a way compatible with the constexpr. + // _GLIBCXX_DEBUG_ASSERT(__pos <= this->_M_len); return *(this->_M_str + __pos); } @@ -200,14 +201,16 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION constexpr const _CharT& front() const { - _GLIBCXX_DEBUG_ASSERT(this->_M_len > 0); + // TODO: Assert to restore in a way compatible with the constexpr. + // _GLIBCXX_DEBUG_ASSERT(this->_M_len > 0); return *this->_M_str; } constexpr const _CharT& back() const { - _GLIBCXX_DEBUG_ASSERT(this->_M_len > 0); + // TODO: Assert to restore in a way compatible with the constexpr. + // _GLIBCXX_DEBUG_ASSERT(this->_M_len > 0); return *(this->_M_str + this->_M_len - 1); } diff --git a/libstdc++-v3/testsuite/experimental/string_view/element_access/char/2.cc b/libstdc++-v3/testsuite/experimental/string_view/element_access/char/2.cc index 949561fcfe91..ef2fcc0e5d5e 100644 --- a/libstdc++-v3/testsuite/experimental/string_view/element_access/char/2.cc +++ b/libstdc++-v3/testsuite/experimental/string_view/element_access/char/2.cc @@ -1,6 +1,5 @@ -// { dg-options "-std=gnu++1y" } // { dg-do run { xfail *-*-* } } -// { dg-options "-O0" } +// { dg-options "-std=gnu++1y -O0" } // { dg-require-debug-mode "" } // Copyright (C) 2013-2014 Free Software Foundation, Inc. @@ -26,6 +25,6 @@ int main() { typedef std::experimental::string_view string_view_type; - experimental::string_view_type s; + string_view_type s; s[0]; // abort } diff --git a/libstdc++-v3/testsuite/experimental/string_view/element_access/wchar_t/2.cc b/libstdc++-v3/testsuite/experimental/string_view/element_access/wchar_t/2.cc index 02f24af5750e..4ffa7ddfe380 100644 --- a/libstdc++-v3/testsuite/experimental/string_view/element_access/wchar_t/2.cc +++ b/libstdc++-v3/testsuite/experimental/string_view/element_access/wchar_t/2.cc @@ -1,6 +1,5 @@ -// { dg-options "-std=gnu++1y" } // { dg-do run { xfail *-*-* } } -// { dg-options "-O0" } +// { dg-options "-std=gnu++1y -O0" } // { dg-require-debug-mode "" } // Copyright (C) 2013-2014 Free Software Foundation, Inc. -- 2.43.5