X-Git-Url: http://plrg.eecs.uci.edu/git/?p=oota-llvm.git;a=blobdiff_plain;f=include%2Fllvm%2FADT%2FStringRef.h;h=350032b8c4e774f96c509e1b77d681ba24b34c54;hp=4491dc3ae16d46143b54420ad15aeee57e558639;hb=56fa307e514c4a792a821595c4fdb48d8b591fc5;hpb=810a9cffb4c926c73e9aed78a7cc117a1abeeebe diff --git a/include/llvm/ADT/StringRef.h b/include/llvm/ADT/StringRef.h index 4491dc3ae16..350032b8c4e 100644 --- a/include/llvm/ADT/StringRef.h +++ b/include/llvm/ADT/StringRef.h @@ -11,8 +11,6 @@ #define LLVM_ADT_STRINGREF_H #include "llvm/Support/Compiler.h" -#include "llvm/Support/ErrorHandling.h" -#include "llvm/Support/type_traits.h" #include #include #include @@ -54,14 +52,9 @@ namespace llvm { /// The length of the string. size_t Length; - // Workaround PR5482: nearly all gcc 4.x miscompile StringRef and std::min() - // Changing the arg of min to be an integer, instead of a reference to an - // integer works around this bug. - static size_t min(size_t a, size_t b) { return a < b ? a : b; } - static size_t max(size_t a, size_t b) { return a > b ? a : b; } - // Workaround memcmp issue with null pointers (undefined behavior) // by providing a specialized version + LLVM_ATTRIBUTE_ALWAYS_INLINE static int compareMemory(const char *Lhs, const char *Rhs, size_t Length) { if (Length == 0) { return 0; } return ::memcmp(Lhs,Rhs,Length); @@ -72,7 +65,7 @@ namespace llvm { /// @{ /// Construct an empty string ref. - /*implicit*/ LLVM_CONSTEXPR StringRef() : Data(0), Length(0) {} + /*implicit*/ StringRef() : Data(nullptr), Length(0) {} /// Construct a string ref from a cstring. /*implicit*/ StringRef(const char *Str) @@ -82,10 +75,15 @@ namespace llvm { } /// Construct a string ref from a pointer and length. - /*implicit*/ LLVM_CONSTEXPR StringRef(const char *data, size_t length) - : Data(data), Length((llvm_expect(data || length == 0), length)) {} + LLVM_ATTRIBUTE_ALWAYS_INLINE + /*implicit*/ StringRef(const char *data, size_t length) + : Data(data), Length(length) { + assert((data || length == 0) && + "StringRef cannot be built from a NULL argument with non-null length"); + } /// Construct a string ref from an std::string. + LLVM_ATTRIBUTE_ALWAYS_INLINE /*implicit*/ StringRef(const std::string &Str) : Data(Str.data()), Length(Str.length()) {} @@ -97,30 +95,52 @@ namespace llvm { iterator end() const { return Data + Length; } + const unsigned char *bytes_begin() const { + return reinterpret_cast(begin()); + } + const unsigned char *bytes_end() const { + return reinterpret_cast(end()); + } + /// @} /// @name String Operations /// @{ /// data - Get a pointer to the start of the string (which may not be null /// terminated). - LLVM_CONSTEXPR const char *data() const { return Data; } + LLVM_ATTRIBUTE_ALWAYS_INLINE + const char *data() const { return Data; } /// empty - Check if the string is empty. - LLVM_CONSTEXPR bool empty() const { return Length == 0; } + LLVM_ATTRIBUTE_ALWAYS_INLINE + bool empty() const { return Length == 0; } /// size - Get the string size. - LLVM_CONSTEXPR size_t size() const { return Length; } + LLVM_ATTRIBUTE_ALWAYS_INLINE + size_t size() const { return Length; } /// front - Get the first character in the string. - LLVM_CONSTEXPR char front() const { return llvm_expect(!empty()), Data[0]; } + char front() const { + assert(!empty()); + return Data[0]; + } /// back - Get the last character in the string. - LLVM_CONSTEXPR char back() const { - return llvm_expect(!empty()), Data[Length - 1]; + char back() const { + assert(!empty()); + return Data[Length-1]; + } + + // copy - Allocate copy in Allocator and return StringRef to it. + template StringRef copy(Allocator &A) const { + char *S = A.template Allocate(Length); + std::copy(begin(), end(), S); + return StringRef(S, Length); } /// equals - Check for string equality, this is more efficient than /// compare() when the relative ordering of inequal strings isn't needed. + LLVM_ATTRIBUTE_ALWAYS_INLINE bool equals(StringRef RHS) const { return (Length == RHS.Length && compareMemory(Data, RHS.Data, RHS.Length) == 0); @@ -133,9 +153,10 @@ namespace llvm { /// compare - Compare two strings; the result is -1, 0, or 1 if this string /// is lexicographically less than, equal to, or greater than the \p RHS. + LLVM_ATTRIBUTE_ALWAYS_INLINE int compare(StringRef RHS) const { // Check the prefix for a mismatch. - if (int Res = compareMemory(Data, RHS.Data, min(Length, RHS.Length))) + if (int Res = compareMemory(Data, RHS.Data, std::min(Length, RHS.Length))) return Res < 0 ? -1 : 1; // Otherwise the prefixes match, so we only need to check the lengths. @@ -174,7 +195,7 @@ namespace llvm { /// str - Get the contents as an std::string. std::string str() const { - if (Data == 0) return std::string(); + if (!Data) return std::string(); return std::string(Data, Length); } @@ -182,8 +203,9 @@ namespace llvm { /// @name Operator Overloads /// @{ - LLVM_CONSTEXPR char operator[](size_t Index) const { - return llvm_expect(Index < Length), Data[Index]; + char operator[](size_t Index) const { + assert(Index < Length && "Invalid index!"); + return Data[Index]; } /// @} @@ -199,6 +221,7 @@ namespace llvm { /// @{ /// Check if this string starts with the given \p Prefix. + LLVM_ATTRIBUTE_ALWAYS_INLINE bool startswith(StringRef Prefix) const { return Length >= Prefix.Length && compareMemory(Data, Prefix.Data, Prefix.Length) == 0; @@ -208,6 +231,7 @@ namespace llvm { bool startswith_lower(StringRef Prefix) const; /// Check if this string ends with the given \p Suffix. + LLVM_ATTRIBUTE_ALWAYS_INLINE bool endswith(StringRef Suffix) const { return Length >= Suffix.Length && compareMemory(end() - Suffix.Length, Suffix.Data, Suffix.Length) == 0; @@ -224,10 +248,14 @@ namespace llvm { /// /// \returns The index of the first occurrence of \p C, or npos if not /// found. + LLVM_ATTRIBUTE_ALWAYS_INLINE size_t find(char C, size_t From = 0) const { - for (size_t i = min(From, Length), e = Length; i != e; ++i) - if (Data[i] == C) - return i; + size_t FindBegin = std::min(From, Length); + if (FindBegin < Length) { // Avoid calling memchr with nullptr. + // Just forward to memchr, which is faster than a hand-rolled loop. + if (const void *P = ::memchr(Data + FindBegin, C, Length - FindBegin)) + return static_cast(P) - Data; + } return npos; } @@ -242,7 +270,7 @@ namespace llvm { /// \returns The index of the last occurrence of \p C, or npos if not /// found. size_t rfind(char C, size_t From = npos) const { - From = min(From, Length); + From = std::min(From, Length); size_t i = From; while (i != 0) { --i; @@ -327,7 +355,7 @@ namespace llvm { /// this returns true to signify the error. The string is considered /// erroneous if empty or if it overflows T. template - typename enable_if_c::is_signed, bool>::type + typename std::enable_if::is_signed, bool>::type getAsInteger(unsigned Radix, T &Result) const { long long LLVal; if (getAsSignedInteger(*this, Radix, LLVal) || @@ -338,11 +366,14 @@ namespace llvm { } template - typename enable_if_c::is_signed, bool>::type + typename std::enable_if::is_signed, bool>::type getAsInteger(unsigned Radix, T &Result) const { unsigned long long ULLVal; + // The additional cast to unsigned long long is required to avoid the + // Visual C++ warning C4805: '!=' : unsafe mix of type 'bool' and type + // 'unsigned __int64' when instantiating getAsInteger with T = bool. if (getAsUnsignedInteger(*this, Radix, ULLVal) || - static_cast(ULLVal) != ULLVal) + static_cast(static_cast(ULLVal)) != ULLVal) return true; Result = ULLVal; return false; @@ -383,13 +414,15 @@ namespace llvm { /// \param N The number of characters to included in the substring. If N /// exceeds the number of characters remaining in the string, the string /// suffix (starting with \p Start) will be returned. + LLVM_ATTRIBUTE_ALWAYS_INLINE StringRef substr(size_t Start, size_t N = npos) const { - Start = min(Start, Length); - return StringRef(Data + Start, min(N, Length - Start)); + Start = std::min(Start, Length); + return StringRef(Data + Start, std::min(N, Length - Start)); } /// Return a StringRef equal to 'this' but with the first \p N elements /// dropped. + LLVM_ATTRIBUTE_ALWAYS_INLINE StringRef drop_front(size_t N = 1) const { assert(size() >= N && "Dropping more elements than exist"); return substr(N); @@ -397,6 +430,7 @@ namespace llvm { /// Return a StringRef equal to 'this' but with the last \p N elements /// dropped. + LLVM_ATTRIBUTE_ALWAYS_INLINE StringRef drop_back(size_t N = 1) const { assert(size() >= N && "Dropping more elements than exist"); return substr(0, size()-N); @@ -412,9 +446,10 @@ namespace llvm { /// substring. If this is npos, or less than \p Start, or exceeds the /// number of characters remaining in the string, the string suffix /// (starting with \p Start) will be returned. + LLVM_ATTRIBUTE_ALWAYS_INLINE StringRef slice(size_t Start, size_t End) const { - Start = min(Start, Length); - End = min(max(Start, End), Length); + Start = std::min(Start, Length); + End = std::min(std::max(Start, End), Length); return StringRef(Data + Start, End - Start); } @@ -455,7 +490,7 @@ namespace llvm { /// Split into substrings around the occurrences of a separator string. /// /// Each substring is stored in \p A. If \p MaxSplit is >= 0, at most - /// \p MaxSplit splits are done and consequently <= \p MaxSplit + /// \p MaxSplit splits are done and consequently <= \p MaxSplit + 1 /// elements are added to A. /// If \p KeepEmpty is false, empty strings are not added to \p A. They /// still count when considering \p MaxSplit @@ -470,6 +505,23 @@ namespace llvm { StringRef Separator, int MaxSplit = -1, bool KeepEmpty = true) const; + /// Split into substrings around the occurrences of a separator character. + /// + /// Each substring is stored in \p A. If \p MaxSplit is >= 0, at most + /// \p MaxSplit splits are done and consequently <= \p MaxSplit + 1 + /// elements are added to A. + /// If \p KeepEmpty is false, empty strings are not added to \p A. They + /// still count when considering \p MaxSplit + /// An useful invariant is that + /// Separator.join(A) == *this if MaxSplit == -1 and KeepEmpty == true + /// + /// \param A - Where to put the substrings. + /// \param Separator - The string to split on. + /// \param MaxSplit - The maximum number of times the string is split. + /// \param KeepEmpty - True if empty substring should be added. + void split(SmallVectorImpl &A, char Separator, int MaxSplit = -1, + bool KeepEmpty = true) const; + /// Split into two substrings around the last occurrence of a separator /// character. /// @@ -511,10 +563,12 @@ namespace llvm { /// @name StringRef Comparison Operators /// @{ + LLVM_ATTRIBUTE_ALWAYS_INLINE inline bool operator==(StringRef LHS, StringRef RHS) { return LHS.equals(RHS); } + LLVM_ATTRIBUTE_ALWAYS_INLINE inline bool operator!=(StringRef LHS, StringRef RHS) { return !(LHS == RHS); } @@ -541,20 +595,6 @@ namespace llvm { /// @} - /// ConstStringRef - A \c StringRef carrying the additional stipulation that - /// the referenced string is a compile-time constant. - /// - /// Use this to specify function parameters that require fixed inputs such - /// as debug and diagnostic messages or format strings. - class ConstStringRef : public StringRef { - public: - /*implicit*/ LLVM_CONSTEXPR ConstStringRef() : StringRef() {} - - template - /*implicit*/ LLVM_CONSTEXPR ConstStringRef(const char (&data)[N]) - : StringRef(data, (llvm_expect(N > 0 && data[N - 1] == '\0'), N - 1)) {} - }; - /// \brief Compute a hash_code for a StringRef. hash_code hash_value(StringRef S);