FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

libstdc++: Enable assertions in constexpr string_view members [PR 71960]

Browse source 
Since GCC 6.1 there is no reason we can't just use __glibcxx_assert in
constexpr functions in string_view. As long as the condition is true,
there will be no call to std::__replacement_assert that would make the
function ineligible for constant evaluation.

	PR libstdc++/71960
	* include/experimental/string_view (basic_string_view):
	Enable debug assertions.
	* include/std/string_view (basic_string_view):
	Likewise.
This commit is contained in:
Jonathan Wakely 2020-08-26 14:47:51 +01:00
parent 2236c45479
commit 3eefb302d2
2 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
libstdc++-v3/include/experimental/string_view
View file

@ -179,8 +179,7 @@ inline namespace fundamentals_v1
constexpr const _CharT&
operator[](size_type __pos) const
{
// TODO: Assert to restore in a way compatible with the constexpr.
// __glibcxx_assert(__pos < this->_M_len);
__glibcxx_assert(__pos < this->_M_len);
return *(this->_M_str + __pos);
}
@ -199,16 +198,14 @@ inline namespace fundamentals_v1
constexpr const _CharT&
front() const
{
// TODO: Assert to restore in a way compatible with the constexpr.
// __glibcxx_assert(this->_M_len > 0);
__glibcxx_assert(this->_M_len > 0);
return *this->_M_str;
}
constexpr const _CharT&
back() const
{
// TODO: Assert to restore in a way compatible with the constexpr.
// __glibcxx_assert(this->_M_len > 0);
__glibcxx_assert(this->_M_len > 0);
return *(this->_M_str + this->_M_len - 1);
}

9
libstdc++-v3/include/std/string_view
View file

@ -207,8 +207,7 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
constexpr const_reference
operator[](size_type __pos) const noexcept
{
// TODO: Assert to restore in a way compatible with the constexpr.
// __glibcxx_assert(__pos < this->_M_len);
__glibcxx_assert(__pos < this->_M_len);
return *(this->_M_str + __pos);
}
@ -225,16 +224,14 @@ _GLIBCXX_BEGIN_NAMESPACE_VERSION
constexpr const_reference
front() const noexcept
{
// TODO: Assert to restore in a way compatible with the constexpr.
// __glibcxx_assert(this->_M_len > 0);
__glibcxx_assert(this->_M_len > 0);
return *this->_M_str;
}
constexpr const_reference
back() const noexcept
{
// TODO: Assert to restore in a way compatible with the constexpr.
// __glibcxx_assert(this->_M_len > 0);
__glibcxx_assert(this->_M_len > 0);
return *(this->_M_str + this->_M_len - 1);
}