This is an archive of the discontinued LLVM Phabricator instance.

Differential D131857

[libc++][string] Removes obsolete constexpr.
ClosedPublic

Authored by Mordante on Aug 14 2022, 5:16 AM.

Details

Reviewers
philnik
Group Reviewers
Restricted Project
Commits
rG00da9e9a0782: [libc++][string] Removes obsolete constexpr.
Summary

Addresses the final review comment of D131421.

Diff Detail

Event Timeline

Mordante created this revision.Aug 14 2022, 5:16 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 14 2022, 5:16 AM
Mordante added a comment.Aug 14 2022, 5:18 AM

This will conflict with D131498. Keeping this as a draft until that patch has landed.

Mordante mentioned this in D131421: [libc++] Uses operator<=> in string..Aug 14 2022, 5:18 AM
Harbormaster completed remote builds in B181161: Diff 452512.Aug 14 2022, 8:15 AM
Mordante updated this revision to Diff 454208.Aug 20 2022, 6:50 AM

Rebased and resolved the conflicts.

Harbormaster completed remote builds in B182376: Diff 454208.Aug 20 2022, 11:32 AM
Mordante published this revision for review.Aug 20 2022, 11:37 AM
Herald added a project: Restricted Project. · View Herald TranscriptAug 20 2022, 11:37 AM
Herald added a reviewer: Restricted Project. · View Herald Transcript
Herald added a subscriber: libcxx-commits. · View Herald Transcript
philnik accepted this revision.Aug 20 2022, 11:39 AM
This revision is now accepted and ready to land.Aug 20 2022, 11:39 AM
Mordante added a comment.Aug 20 2022, 11:41 AM

Thanks for the quick review!

Closed by commit rG00da9e9a0782: [libc++][string] Removes obsolete constexpr. (authored by Mordante). · Explain WhyAug 20 2022, 11:42 AM
This revision was automatically updated to reflect the committed changes.
Mordante added a commit: rG00da9e9a0782: [libc++][string] Removes obsolete constexpr..

Revision Contents

PathSize
libcxx/
include/
64 lines

Diff 454208

libcxx/include/string

Show First 20 Lines • Show All 369 Lines • ▼ Show 20 Lines
basic_string<charT, traits, Allocator> basic_string<charT, traits, Allocator>
operator+(const basic_string<charT, traits, Allocator>& lhs, charT rhs); // constexpr since C++20 operator+(const basic_string<charT, traits, Allocator>& lhs, charT rhs); // constexpr since C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator==(const basic_string<charT, traits, Allocator>& lhs, bool operator==(const basic_string<charT, traits, Allocator>& lhs,
const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20 const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator==(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20, removed in C++20 bool operator==(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator==(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs) noexcept; // constexpr since C++20 bool operator==(const basic_string<charT,traits,Allocator>& lhs, const charT* rhs) noexcept; // constexpr since C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator!=(const basic_string<charT,traits,Allocator>& lhs, bool operator!=(const basic_string<charT,traits,Allocator>& lhs,
const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20, removed in C++20 const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator!=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20, removed in C++20 bool operator!=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator!=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // constexpr since C++20, removed in C++20 bool operator!=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator< (const basic_string<charT, traits, Allocator>& lhs, bool operator< (const basic_string<charT, traits, Allocator>& lhs,
const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20, removed in C++20 const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator< (const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // constexpr since C++20, removed in C++20 bool operator< (const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator< (const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20, removed in C++20 bool operator< (const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator> (const basic_string<charT, traits, Allocator>& lhs, bool operator> (const basic_string<charT, traits, Allocator>& lhs,
const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20, removed in C++20 const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator> (const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // constexpr since C++20, removed in C++20 bool operator> (const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator> (const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20, removed in C++20 bool operator> (const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator<=(const basic_string<charT, traits, Allocator>& lhs, bool operator<=(const basic_string<charT, traits, Allocator>& lhs,
const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20, removed in C++20 const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator<=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // constexpr since C++20, removed in C++20 bool operator<=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator<=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20, removed in C++20 bool operator<=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator>=(const basic_string<charT, traits, Allocator>& lhs, bool operator>=(const basic_string<charT, traits, Allocator>& lhs,
const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20, removed in C++20 const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator>=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // constexpr since C++20, removed in C++20 bool operator>=(const basic_string<charT, traits, Allocator>& lhs, const charT* rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> template<class charT, class traits, class Allocator>
bool operator>=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // constexpr since C++20, removed in C++20 bool operator>=(const charT* lhs, const basic_string<charT, traits, Allocator>& rhs) noexcept; // removed in C++20
template<class charT, class traits, class Allocator> // since C++20 template<class charT, class traits, class Allocator> // since C++20
constexpr see below operator<=>(const basic_string<charT, traits, Allocator>& lhs, constexpr see below operator<=>(const basic_string<charT, traits, Allocator>& lhs,
const basic_string<charT, traits, Allocator>& rhs) noexcept; const basic_string<charT, traits, Allocator>& rhs) noexcept;
template<class charT, class traits, class Allocator> // since C++20 template<class charT, class traits, class Allocator> // since C++20
constexpr see below operator<=>(const basic_string<charT, traits, Allocator>& lhs, constexpr see below operator<=>(const basic_string<charT, traits, Allocator>& lhs,
const charT* rhs) noexcept; const charT* rhs) noexcept;
▲ Show 20 Lines • Show All 3,748 Lines • ▼ Show 20 Linesoperator==(const basic_string<char, char_traits<char>, _Allocator>& __lhs,
for (; __lhs_sz != 0; --__lhs_sz, ++__lp, ++__rp) for (; __lhs_sz != 0; --__lhs_sz, ++__lp, ++__rp)
if (*__lp != *__rp) if (*__lp != *__rp)
return false; return false;
return true; return true;
} }
#if _LIBCPP_STD_VER <= 17 #if _LIBCPP_STD_VER <= 17
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator==(const _CharT* __lhs, operator==(const _CharT* __lhs,
const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
{ {
typedef basic_string<_CharT, _Traits, _Allocator> _String; typedef basic_string<_CharT, _Traits, _Allocator> _String;
_LIBCPP_ASSERT(__lhs != nullptr, "operator==(char*, basic_string): received nullptr"); _LIBCPP_ASSERT(__lhs != nullptr, "operator==(char*, basic_string): received nullptr");
size_t __lhs_len = _Traits::length(__lhs); size_t __lhs_len = _Traits::length(__lhs);
if (__lhs_len != __rhs.size()) return false; if (__lhs_len != __rhs.size()) return false;
Show All 31 Lines
_LIBCPP_HIDE_FROM_ABI constexpr auto _LIBCPP_HIDE_FROM_ABI constexpr auto
operator<=>(const basic_string<_CharT, _Traits, _Allocator>& __lhs, const _CharT* __rhs) { operator<=>(const basic_string<_CharT, _Traits, _Allocator>& __lhs, const _CharT* __rhs) {
return basic_string_view<_CharT, _Traits>(__lhs) <=> basic_string_view<_CharT, _Traits>(__rhs); return basic_string_view<_CharT, _Traits>(__lhs) <=> basic_string_view<_CharT, _Traits>(__rhs);
} }
#else // _LIBCPP_STD_VER > 17 #else // _LIBCPP_STD_VER > 17
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator!=(const basic_string<_CharT,_Traits,_Allocator>& __lhs, operator!=(const basic_string<_CharT,_Traits,_Allocator>& __lhs,
const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
{ {
return !(__lhs == __rhs); return !(__lhs == __rhs);
} }
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator!=(const _CharT* __lhs, operator!=(const _CharT* __lhs,
const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
{ {
return !(__lhs == __rhs); return !(__lhs == __rhs);
} }
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator!=(const basic_string<_CharT, _Traits, _Allocator>& __lhs, operator!=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
const _CharT* __rhs) _NOEXCEPT const _CharT* __rhs) _NOEXCEPT
{ {
return !(__lhs == __rhs); return !(__lhs == __rhs);
} }
// operator< // operator<
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs, operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
{ {
return __lhs.compare(__rhs) < 0; return __lhs.compare(__rhs) < 0;
} }
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs, operator< (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
const _CharT* __rhs) _NOEXCEPT const _CharT* __rhs) _NOEXCEPT
{ {
return __lhs.compare(__rhs) < 0; return __lhs.compare(__rhs) < 0;
} }
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator< (const _CharT* __lhs, operator< (const _CharT* __lhs,
const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
{ {
return __rhs.compare(__lhs) > 0; return __rhs.compare(__lhs) > 0;
} }
// operator> // operator>
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs, operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
{ {
return __rhs < __lhs; return __rhs < __lhs;
} }
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs, operator> (const basic_string<_CharT, _Traits, _Allocator>& __lhs,
const _CharT* __rhs) _NOEXCEPT const _CharT* __rhs) _NOEXCEPT
{ {
return __rhs < __lhs; return __rhs < __lhs;
} }
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator> (const _CharT* __lhs, operator> (const _CharT* __lhs,
const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
{ {
return __rhs < __lhs; return __rhs < __lhs;
} }
// operator<= // operator<=
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs, operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
{ {
return !(__rhs < __lhs); return !(__rhs < __lhs);
} }
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs, operator<=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
const _CharT* __rhs) _NOEXCEPT const _CharT* __rhs) _NOEXCEPT
{ {
return !(__rhs < __lhs); return !(__rhs < __lhs);
} }
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator<=(const _CharT* __lhs, operator<=(const _CharT* __lhs,
const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
{ {
return !(__rhs < __lhs); return !(__rhs < __lhs);
} }
// operator>= // operator>=
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs, operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
{ {
return !(__lhs < __rhs); return !(__lhs < __rhs);
} }
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs, operator>=(const basic_string<_CharT, _Traits, _Allocator>& __lhs,
const _CharT* __rhs) _NOEXCEPT const _CharT* __rhs) _NOEXCEPT
{ {
return !(__lhs < __rhs); return !(__lhs < __rhs);
} }
template<class _CharT, class _Traits, class _Allocator> template<class _CharT, class _Traits, class _Allocator>
inline _LIBCPP_CONSTEXPR_SINCE_CXX20 _LIBCPP_HIDE_FROM_ABI inline _LIBCPP_HIDE_FROM_ABI
bool bool
operator>=(const _CharT* __lhs, operator>=(const _CharT* __lhs,
const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT const basic_string<_CharT, _Traits, _Allocator>& __rhs) _NOEXCEPT
{ {
return !(__lhs < __rhs); return !(__lhs < __rhs);
} }
#endif // _LIBCPP_STD_VER > 17 #endif // _LIBCPP_STD_VER > 17
▲ Show 20 Lines • Show All 371 Lines • Show Last 20 Lines