Skip to content

Revert "[ADT] Use std::string_view inside StringRef (#113775)" #114133

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.

Sign up for GitHub

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 1 commit into from
Oct 29, 2024
Merged

Revert "[ADT] Use std::string_view inside StringRef (#113775)" #114133

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 16 additions & 10 deletions llvm/include/llvm/ADT/StringRef.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,11 @@ namespace llvm {
using const_reverse_iterator = std::reverse_iterator<const_iterator>;

private:
std::string_view View;
/// The start of the string, in an external buffer.
const char *Data = nullptr;

/// The length of the string.
size_t Length = 0;

// Workaround memcmp issue with null pointers (undefined behavior)
// by providing a specialized version
Expand All @@ -82,26 +86,28 @@ namespace llvm {

/// Construct a string ref from a cstring.
/*implicit*/ constexpr StringRef(const char *Str LLVM_LIFETIME_BOUND)
: View(Str, Str ?
: Data(Str), Length(Str ?
// GCC 7 doesn't have constexpr char_traits. Fall back to __builtin_strlen.
#if defined(_GLIBCXX_RELEASE) && _GLIBCXX_RELEASE < 8
__builtin_strlen(Str)
__builtin_strlen(Str)
#else
std::char_traits<char>::length(Str)
std::char_traits<char>::length(Str)
#endif
: 0) {
: 0) {
}

/// Construct a string ref from a pointer and length.
/*implicit*/ constexpr StringRef(const char *data LLVM_LIFETIME_BOUND,
size_t length)
: View(data, length) {}
: Data(data), Length(length) {}

/// Construct a string ref from an std::string.
/*implicit*/ StringRef(const std::string &Str) : View(Str) {}
/*implicit*/ StringRef(const std::string &Str)
: Data(Str.data()), Length(Str.length()) {}

/// Construct a string ref from an std::string_view.
/*implicit*/ constexpr StringRef(std::string_view Str) : View(Str) {}
/*implicit*/ constexpr StringRef(std::string_view Str)
: Data(Str.data()), Length(Str.size()) {}

/// @}
/// @name Iterators
Expand Down Expand Up @@ -135,13 +141,13 @@ namespace llvm {

/// data - Get a pointer to the start of the string (which may not be null
/// terminated).
[[nodiscard]] constexpr const char *data() const { return View.data(); }
[[nodiscard]] constexpr const char *data() const { return Data; }

/// empty - Check if the string is empty.
[[nodiscard]] constexpr bool empty() const { return size() == 0; }

/// size - Get the string size.
[[nodiscard]] constexpr size_t size() const { return View.size(); }
[[nodiscard]] constexpr size_t size() const { return Length; }

/// front - Get the first character in the string.
[[nodiscard]] char front() const {
Expand Down
Loading