Revert "[ADT] Teach StringRef to derive from std::string_view" #113767
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This reverts commit a3181b1.
|
@llvm/pr-subscribers-llvm-adt Author: Fangrui Song (MaskRay) ChangesReverts llvm/llvm-project#113752 Many build bot failures Full diff: https://github.com/llvm/llvm-project/pull/113767.diff 1 Files Affected:
diff --git a/llvm/include/llvm/ADT/StringRef.h b/llvm/include/llvm/ADT/StringRef.h
index 49b6b8ff52abec..d5f30b88c4c6a2 100644
--- a/llvm/include/llvm/ADT/StringRef.h
+++ b/llvm/include/llvm/ADT/StringRef.h
@@ -48,9 +48,7 @@ namespace llvm {
/// situations where the character data resides in some other buffer, whose
/// lifetime extends past that of the StringRef. For this reason, it is not in
/// general safe to store a StringRef.
- class LLVM_GSL_POINTER StringRef : public std::string_view {
- using Base = std::string_view;
-
+ class LLVM_GSL_POINTER StringRef {
public:
static constexpr size_t npos = ~size_t(0);
@@ -62,6 +60,12 @@ namespace llvm {
using const_reverse_iterator = std::reverse_iterator<const_iterator>;
private:
+ /// 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
static int compareMemory(const char *Lhs, const char *Rhs, size_t Length) {
@@ -82,25 +86,27 @@ namespace llvm {
/// Construct a string ref from a cstring.
/*implicit*/ constexpr StringRef(const char *Str)
- : Base(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, size_t length)
- : Base(data, length) {}
+ : Data(data), Length(length) {}
/// Construct a string ref from an std::string.
- /*implicit*/ StringRef(const std::string &Str) : Base(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) : Base(Str) {}
+ /*implicit*/ constexpr StringRef(std::string_view Str)
+ : Data(Str.data()), Length(Str.size()) {}
/// @}
/// @name Iterators
@@ -132,9 +138,16 @@ namespace llvm {
/// @name String Operations
/// @{
+ /// data - Get a pointer to the start of the string (which may not be null
+ /// terminated).
+ [[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 Length; }
+
/// front - Get the first character in the string.
[[nodiscard]] char front() const {
assert(!empty());
@@ -235,6 +248,14 @@ namespace llvm {
std::enable_if_t<std::is_same<T, std::string>::value, StringRef> &
operator=(T &&Str) = delete;
+ /// @}
+ /// @name Type Conversions
+ /// @{
+
+ constexpr operator std::string_view() const {
+ return std::string_view(data(), size());
+ }
+
/// @}
/// @name String Predicates
/// @{
|
|
Thanks! |
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/66/builds/5389 Here is the relevant piece of the build log for the reference |
NoumanAmir657
pushed a commit
to NoumanAmir657/llvm-project
that referenced
this pull request
Nov 4, 2024
…113767) Reverts llvm#113752 Many build bot failures
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Reverts #113752
Many build bot failures