Skip to content

Commit b6c6104

Browse files
committed
[libc++] Remove assertions from <string_view> that are unreachable
1 parent d86c63d commit b6c6104

File tree

1 file changed

+0
-8
lines changed

1 file changed

+0
-8
lines changed

libcxx/include/string_view

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,6 @@ public:
500500
// find
501501
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI size_type
502502
find(basic_string_view __s, size_type __pos = 0) const _NOEXCEPT {
503-
_LIBCPP_ASSERT_NON_NULL(__s.size() == 0 || __s.data() != nullptr, "string_view::find(): received nullptr");
504503
return std::__str_find<value_type, size_type, traits_type, npos>(data(), size(), __s.data(), __pos, __s.size());
505504
}
506505

@@ -524,7 +523,6 @@ public:
524523
// rfind
525524
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI size_type
526525
rfind(basic_string_view __s, size_type __pos = npos) const _NOEXCEPT {
527-
_LIBCPP_ASSERT_NON_NULL(__s.size() == 0 || __s.data() != nullptr, "string_view::find(): received nullptr");
528526
return std::__str_rfind<value_type, size_type, traits_type, npos>(data(), size(), __s.data(), __pos, __s.size());
529527
}
530528

@@ -549,7 +547,6 @@ public:
549547
// find_first_of
550548
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI size_type
551549
find_first_of(basic_string_view __s, size_type __pos = 0) const _NOEXCEPT {
552-
_LIBCPP_ASSERT_NON_NULL(__s.size() == 0 || __s.data() != nullptr, "string_view::find_first_of(): received nullptr");
553550
return std::__str_find_first_of<value_type, size_type, traits_type, npos>(
554551
data(), size(), __s.data(), __pos, __s.size());
555552
}
@@ -575,7 +572,6 @@ public:
575572
// find_last_of
576573
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI size_type
577574
find_last_of(basic_string_view __s, size_type __pos = npos) const _NOEXCEPT {
578-
_LIBCPP_ASSERT_NON_NULL(__s.size() == 0 || __s.data() != nullptr, "string_view::find_last_of(): received nullptr");
579575
return std::__str_find_last_of<value_type, size_type, traits_type, npos>(
580576
data(), size(), __s.data(), __pos, __s.size());
581577
}
@@ -601,8 +597,6 @@ public:
601597
// find_first_not_of
602598
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI size_type
603599
find_first_not_of(basic_string_view __s, size_type __pos = 0) const _NOEXCEPT {
604-
_LIBCPP_ASSERT_NON_NULL(
605-
__s.size() == 0 || __s.data() != nullptr, "string_view::find_first_not_of(): received nullptr");
606600
return std::__str_find_first_not_of<value_type, size_type, traits_type, npos>(
607601
data(), size(), __s.data(), __pos, __s.size());
608602
}
@@ -628,8 +622,6 @@ public:
628622
// find_last_not_of
629623
_LIBCPP_CONSTEXPR_SINCE_CXX14 _LIBCPP_HIDE_FROM_ABI size_type
630624
find_last_not_of(basic_string_view __s, size_type __pos = npos) const _NOEXCEPT {
631-
_LIBCPP_ASSERT_NON_NULL(
632-
__s.size() == 0 || __s.data() != nullptr, "string_view::find_last_not_of(): received nullptr");
633625
return std::__str_find_last_not_of<value_type, size_type, traits_type, npos>(
634626
data(), size(), __s.data(), __pos, __s.size());
635627
}

0 commit comments

Comments
 (0)