Skip to content

Suppress a redundant hardening check in basic_string_view::substr #91804

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jul 23, 2024
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 14 additions & 1 deletion libcxx/include/string_view
Original file line number Diff line number Diff line change
Expand Up @@ -448,8 +448,11 @@ public:
}

_LIBCPP_CONSTEXPR _LIBCPP_HIDE_FROM_ABI basic_string_view substr(size_type __pos = 0, size_type __n = npos) const {
// Use the `__assume_valid` form of the constructor to avoid an unnecessary check. Any substring of a view is a
// valid view. In particular, `size()` is known to be smaller than `numeric_limits<difference_type>::max()`, so the
// new size is also smaller. See also https://github.com/llvm/llvm-project/issues/91634.
return __pos > size() ? (__throw_out_of_range("string_view::substr"), basic_string_view())
: basic_string_view(data() + __pos, std::min(__n, size() - __pos));
: basic_string_view(__assume_valid(), data() + __pos, std::min(__n, size() - __pos));
}

_LIBCPP_CONSTEXPR_SINCE_CXX14 int compare(basic_string_view __sv) const _NOEXCEPT {
Expand Down Expand Up @@ -674,6 +677,16 @@ public:
#endif

private:
struct __assume_valid {};

// This is the same as the pointer and length constructor, but without the additional hardening checks. It is intended
// for use within the class, when the class invariants already guarantee the resulting object is valid. The compiler
// usually cannot eliminate the redundant checks because it does not know class invariants.
_LIBCPP_CONSTEXPR _LIBCPP_HIDE_FROM_ABI
basic_string_view(__assume_valid, const _CharT* __s, size_type __len) _NOEXCEPT
: __data_(__s),
__size_(__len) {}

const value_type* __data_;
size_type __size_;
};
Expand Down
Loading