[Lldb-commits] [PATCH] D27780: Make OptionDefinition structure store a StringRef
Zachary Turner via Phabricator via lldb-commits
lldb-commits at lists.llvm.org
Thu Dec 15 11:13:10 PST 2016
This revision was automatically updated to reflect the committed changes.
Closed by commit rL289853: [StringRef] Add enable-if to StringLiteral. (authored by zturner).
Changed prior to commit:
https://reviews.llvm.org/D27780?vs=81487&id=81624#toc
Repository:
rL LLVM
https://reviews.llvm.org/D27780
Files:
llvm/trunk/include/llvm/ADT/StringRef.h
Index: llvm/trunk/include/llvm/ADT/StringRef.h
===================================================================
--- llvm/trunk/include/llvm/ADT/StringRef.h
+++ llvm/trunk/include/llvm/ADT/StringRef.h
@@ -838,22 +838,21 @@
/// A wrapper around a string literal that serves as a proxy for constructing
/// global tables of StringRefs with the length computed at compile time.
- /// Using this class with a non-literal char array is considered undefined
- /// behavior. To prevent this, it is recommended that StringLiteral *only*
- /// be used in a constexpr context, as such:
+ /// In order to avoid the invocation of a global constructor, StringLiteral
+ /// should *only* be used in a constexpr context, as such:
///
/// constexpr StringLiteral S("test");
///
- /// Note: There is a subtle behavioral difference in the constructor of
- /// StringRef and StringLiteral, as illustrated below:
- ///
- /// constexpr StringLiteral S("a\0b"); // S.size() == 3
- /// StringRef S("a\0b"); // S.size() == 1
- ///
class StringLiteral : public StringRef {
public:
template <size_t N>
- constexpr StringLiteral(const char (&Str)[N]) : StringRef(Str, N - 1) {}
+ constexpr StringLiteral(const char (&Str)[N])
+#if __has_attribute(enable_if)
+ __attribute((enable_if(__builtin_strlen(Str) == N - 1,
+ "invalid string literal")))
+#endif
+ : StringRef(Str, N - 1) {
+ }
};
/// @name StringRef Comparison Operators
@@ -865,9 +864,7 @@
}
LLVM_ATTRIBUTE_ALWAYS_INLINE
- inline bool operator!=(StringRef LHS, StringRef RHS) {
- return !(LHS == RHS);
- }
+ inline bool operator!=(StringRef LHS, StringRef RHS) { return !(LHS == RHS); }
inline bool operator<(StringRef LHS, StringRef RHS) {
return LHS.compare(RHS) == -1;
-------------- next part --------------
A non-text attachment was scrubbed...
Name: D27780.81624.patch
Type: text/x-patch
Size: 1833 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/lldb-commits/attachments/20161215/969d72e8/attachment.bin>
More information about the lldb-commits
mailing list