puremourning created this revision.
puremourning requested review of this revision.
Herald added a project: LLDB.
Herald added a subscriber: lldb-commits.
When printing a std::string_view, print the referenced string as the
summary. Support string_view, u32string_view, u16string_view and
wstring_view, as we do for std::string and friends.
This is based on the existing fomratter for std::string, and just
extracts the data and length members, pushing them through the existing
string formatter.
In testing this, a "FIXME" was corrected for printing of non-ASCII empty
values. Previously, the "u", 'U" etc. prefixes were not printed for
basic_string<> types that were not char. This is trivial to resolve by
printing the prefix before the `""`.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D112222
Files:
lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/Makefile
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py
lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/main.cpp
Index: lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/main.cpp
===================================================================
--- /dev/null
+++ lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/main.cpp
@@ -0,0 +1,27 @@
+#include <string>
+#include <stdint.h>
+#include <string_view>
+
+int main()
+{
+ std::wstring_view wempty(L"");
+ std::wstring_view s(L"hello world! ××× ×××!");
+ std::wstring_view S(L"!!!!");
+ std::string_view empty("");
+ std::string q_source = "hello world";
+ std::string_view q(q_source);
+ std::string_view Q("quite a long std::strin with lots of info inside it");
+ std::string_view TheVeryLongOne("1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890someText1234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890123456789012345678901234567890");
+ std::string_view IHaveEmbeddedZeros("a\0b\0c\0d",7);
+ std::wstring_view IHaveEmbeddedZerosToo(L"hello world!\0ã¦ã ã«ãä¨ãã §æ§ ãã
ã¸ç¦ç©¤è¥© ãã馩ãªã§ 䤦ç£", 38);
+ std::u16string_view u16_string(u"Ãæ°´æ°¶");
+ std::u16string_view u16_empty(u"");
+ std::u32string_view u32_string(U"ðð
ðð");
+ std::u32string_view u32_empty(U"");
+ std::basic_string<unsigned char> uchar_source(10, 'a');
+ std::basic_string_view<unsigned char> uchar(uchar_source.data(), 5);
+ std::string_view *null_str = nullptr;
+
+ q_source[0] = 'H'; // Set break point at this line.
+ return 0;
+}
Index: lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py
===================================================================
--- lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py
+++ lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/TestDataFormatterLibcxxStringView.py
@@ -11,7 +11,7 @@
from lldbsuite.test import lldbutil
-class LibcxxStringDataFormatterTestCase(TestBase):
+class LibcxxStringViewDataFormatterTestCase(TestBase):
mydir = TestBase.compute_mydir(__file__)
@@ -62,25 +62,23 @@
self.expect(
"frame variable",
substrs=[
- '(%s::wstring) wempty = L""'%ns,
- '(%s::wstring) s = L"hello world! ××× ×××!"'%ns,
- '(%s::wstring) S = L"!!!!"'%ns,
- '(const wchar_t *) mazeltov = 0x',
- 'L"××× ×××"',
- '(%s::string) empty = ""'%ns,
- '(%s::string) q = "hello world"'%ns,
- '(%s::string) Q = "quite a long std::strin with lots of info inside it"'%ns,
- '(%s::string) IHaveEmbeddedZeros = "a\\0b\\0c\\0d"'%ns,
- '(%s::wstring) IHaveEmbeddedZerosToo = L"hello world!\\0ã¦ã ã«ãä¨ãã §æ§ ãã
ã¸ç¦ç©¤è¥© ãã馩ãªã§ 䤦ç£"'%ns,
- '(%s::u16string) u16_string = u"Ãæ°´æ°¶"'%ns,
- # FIXME: This should have a 'u' prefix.
- '(%s::u16string) u16_empty = ""'%ns,
- '(%s::u32string) u32_string = U"ðð
ðð"'%ns,
- # FIXME: This should have a 'U' prefix.
- '(%s::u32string) u32_empty = ""'%ns,
+ '(%s::wstring_view) wempty = L""'%ns,
+ '(%s::wstring_view) s = L"hello world! ××× ×××!"'%ns,
+ '(%s::wstring_view) S = L"!!!!"'%ns,
+ '(%s::string_view) empty = ""'%ns,
+ '(%s::string) q_source = "hello world"'%ns,
+ '(%s::string_view) q = "hello world"'%ns,
+ '(%s::string_view) Q = "quite a long std::strin with lots of info inside it"'%ns,
+ '(%s::string_view) IHaveEmbeddedZeros = "a\\0b\\0c\\0d"'%ns,
+ '(%s::wstring_view) IHaveEmbeddedZerosToo = L"hello world!\\0ã¦ã ã«ãä¨ãã §æ§ ãã
ã¸ç¦ç©¤è¥© ãã馩ãªã§ 䤦ç£"'%ns,
+ '(%s::u16string_view) u16_string = u"Ãæ°´æ°¶"'%ns,
+ '(%s::u16string_view) u16_empty = u""'%ns,
+ '(%s::u32string_view) u32_string = U"ðð
ðð"'%ns,
+ '(%s::u32string_view) u32_empty = U""'%ns,
'(%s::basic_string<unsigned char, %s::char_traits<unsigned char>, '
- '%s::allocator<unsigned char> >) uchar = "aaaaa"'%(ns,ns,ns),
- '(%s::string *) null_str = nullptr'%ns,
+ '%s::allocator<unsigned char> >) uchar_source = "aaaaaaaaaa"'%(ns,ns,ns),
+ '(%s::basic_string_view<unsigned char, %s::char_traits<unsigned char> >) uchar = "aaaaa"'%(ns,ns),
+ '(%s::string_view *) null_str = nullptr'%ns,
])
self.runCmd("n")
@@ -101,31 +99,22 @@
cappedSummary.find("someText") <= 0,
"cappedSummary includes the full string")
- self.expect_expr("s", result_type=ns+"::wstring", result_summary='L"hello world! ××× ×××!"')
+ self.expect_expr("s", result_type=ns+"::wstring_view", result_summary='L"hello world! ××× ×××!"')
self.expect(
"frame variable",
substrs=[
- '(%s::wstring) S = L"!!!!!"'%ns,
- '(const wchar_t *) mazeltov = 0x',
- 'L"××× ×××"',
- '(%s::string) q = "hello world"'%ns,
- '(%s::string) Q = "quite a long std::strin with lots of info inside it"'%ns,
- '(%s::string) IHaveEmbeddedZeros = "a\\0b\\0c\\0d"'%ns,
- '(%s::wstring) IHaveEmbeddedZerosToo = L"hello world!\\0ã¦ã ã«ãä¨ãã §æ§ ãã
ã¸ç¦ç©¤è¥© ãã馩ãªã§ 䤦ç£"'%ns,
- '(%s::u16string) u16_string = u"Ãæ°´æ°¶"'%ns,
- '(%s::u32string) u32_string = U"ðð
ðð"'%ns,
- '(%s::u32string) u32_empty = ""'%ns,
+ '(%s::wstring_view) S = L"!!!!"'%ns,
+ '(%s::string) q_source = "Hello world"'%ns,
+ '(%s::string_view) q = "Hello world"'%ns,
+ '(%s::string_view) Q = "quite a long std::strin with lots of info inside it"'%ns,
+ '(%s::string_view) IHaveEmbeddedZeros = "a\\0b\\0c\\0d"'%ns,
+ '(%s::wstring_view) IHaveEmbeddedZerosToo = L"hello world!\\0ã¦ã ã«ãä¨ãã §æ§ ãã
ã¸ç¦ç©¤è¥© ãã馩ãªã§ 䤦ç£"'%ns,
+ '(%s::u16string_view) u16_string = u"Ãæ°´æ°¶"'%ns,
+ '(%s::u32string_view) u32_string = U"ðð
ðð"'%ns,
+ '(%s::u32string_view) u32_empty = U""'%ns,
'(%s::basic_string<unsigned char, %s::char_traits<unsigned char>, '
- '%s::allocator<unsigned char> >) uchar = "aaaaa"'%(ns,ns,ns),
- '(%s::string *) null_str = nullptr'%ns,
+ '%s::allocator<unsigned char> >) uchar_source = "aaaaaaaaaa"'%(ns,ns,ns),
+ '(%s::basic_string_view<unsigned char, %s::char_traits<unsigned char> >) uchar = "aaaaa"'%(ns,ns),
+ '(%s::string_view *) null_str = nullptr'%ns,
])
-
- # The test assumes that std::string is in its cap-size-data layout.
- is_alternate_layout = ('arm' in self.getArchitecture()) and self.platformIsDarwin()
- if is_64_bit and not is_alternate_layout:
- self.expect("frame variable garbage1", substrs=['garbage1 = Summary Unavailable'])
- self.expect("frame variable garbage2", substrs=[r'garbage2 = "\xfa\xfa\xfa\xfa"'])
- self.expect("frame variable garbage3", substrs=[r'garbage3 = "\xf0\xf0"'])
- self.expect("frame variable garbage4", substrs=['garbage4 = Summary Unavailable'])
- self.expect("frame variable garbage5", substrs=['garbage5 = Summary Unavailable'])
Index: lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/Makefile
===================================================================
--- /dev/null
+++ lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string_view/Makefile
@@ -0,0 +1,6 @@
+CXX_SOURCES := main.cpp
+
+USE_LIBCPP := 1
+
+CXXFLAGS_EXTRAS := -std=c++11 -O0
+include Makefile.rules
Index: lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
===================================================================
--- lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
+++ lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py
@@ -73,11 +73,9 @@
'(%s::string) IHaveEmbeddedZeros = "a\\0b\\0c\\0d"'%ns,
'(%s::wstring) IHaveEmbeddedZerosToo = L"hello world!\\0ã¦ã ã«ãä¨ãã §æ§ ãã
ã¸ç¦ç©¤è¥© ãã馩ãªã§ 䤦ç£"'%ns,
'(%s::u16string) u16_string = u"Ãæ°´æ°¶"'%ns,
- # FIXME: This should have a 'u' prefix.
- '(%s::u16string) u16_empty = ""'%ns,
+ '(%s::u16string) u16_empty = u""'%ns,
'(%s::u32string) u32_string = U"ðð
ðð"'%ns,
- # FIXME: This should have a 'U' prefix.
- '(%s::u32string) u32_empty = ""'%ns,
+ '(%s::u32string) u32_empty = U""'%ns,
'(%s::basic_string<unsigned char, %s::char_traits<unsigned char>, '
'%s::allocator<unsigned char> >) uchar = "aaaaa"'%(ns,ns,ns),
'(%s::string *) null_str = nullptr'%ns,
@@ -115,7 +113,7 @@
'(%s::wstring) IHaveEmbeddedZerosToo = L"hello world!\\0ã¦ã ã«ãä¨ãã §æ§ ãã
ã¸ç¦ç©¤è¥© ãã馩ãªã§ 䤦ç£"'%ns,
'(%s::u16string) u16_string = u"Ãæ°´æ°¶"'%ns,
'(%s::u32string) u32_string = U"ðð
ðð"'%ns,
- '(%s::u32string) u32_empty = ""'%ns,
+ '(%s::u32string) u32_empty = U""'%ns,
'(%s::basic_string<unsigned char, %s::char_traits<unsigned char>, '
'%s::allocator<unsigned char> >) uchar = "aaaaa"'%(ns,ns,ns),
'(%s::string *) null_str = nullptr'%ns,
Index: lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
===================================================================
--- lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
+++ lldb/source/Plugins/Language/CPlusPlus/LibCxx.h
@@ -34,6 +34,22 @@
ValueObject &valobj, Stream &stream,
const TypeSummaryOptions &options); // libc++ std::wstring
+bool LibcxxStringViewSummaryProviderASCII(
+ ValueObject &valueObj, Stream &stream,
+ const TypeSummaryOptions &summary_options); // libc++ std::string_view
+
+bool LibcxxStringViewSummaryProviderUTF16(
+ ValueObject &valobj, Stream &stream,
+ const TypeSummaryOptions &summary_options); // libc++ std::u16string_view
+
+bool LibcxxStringViewSummaryProviderUTF32(
+ ValueObject &valobj, Stream &stream,
+ const TypeSummaryOptions &summary_options); // libc++ std::u32string_view
+
+bool LibcxxWStringViewSummaryProvider(
+ ValueObject &valobj, Stream &stream,
+ const TypeSummaryOptions &options); // libc++ std::wstring_view
+
bool LibcxxOptionalSummaryProvider(
ValueObject &valobj, Stream &stream,
const TypeSummaryOptions &options); // libc++ std::optional<>
Index: lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
===================================================================
--- lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
+++ lldb/source/Plugins/Language/CPlusPlus/LibCxx.cpp
@@ -19,6 +19,7 @@
#include "lldb/Target/ProcessStructReader.h"
#include "lldb/Target/SectionLoadList.h"
#include "lldb/Target/Target.h"
+#include "lldb/Utility/ConstString.h"
#include "lldb/Utility/DataBufferHeap.h"
#include "lldb/Utility/Endian.h"
#include "lldb/Utility/Status.h"
@@ -560,7 +561,7 @@
return {};
ValueObjectSP layout_decider(
- D->GetChildAtIndexPath(llvm::ArrayRef<size_t>({0, 0})));
+ D->GetChildAtIndexPath(llvm::ArrayRef<size_t>({0, 0})));
// this child should exist
if (!layout_decider)
@@ -643,16 +644,10 @@
return std::make_pair(size, location_sp);
}
-bool lldb_private::formatters::LibcxxWStringSummaryProvider(
- ValueObject &valobj, Stream &stream,
- const TypeSummaryOptions &summary_options) {
- auto string_info = ExtractLibcxxStringInfo(valobj);
- if (!string_info)
- return false;
- uint64_t size;
- ValueObjectSP location_sp;
- std::tie(size, location_sp) = *string_info;
-
+static bool
+LibcxxWStringSummaryProvider(ValueObject &valobj, Stream &stream,
+ const TypeSummaryOptions &summary_options,
+ ValueObjectSP location_sp, size_t size) {
if (size == 0) {
stream.Printf("L\"\"");
return true;
@@ -660,7 +655,6 @@
if (!location_sp)
return false;
-
StringPrinter::ReadBufferAndDumpToStreamOptions options(valobj);
if (summary_options.GetCapping() == TypeSummaryCapping::eTypeSummaryCapped) {
const auto max_size = valobj.GetTargetSP()->GetMaximumSizeOfStringSummary();
@@ -714,10 +708,9 @@
return false;
}
-template <StringPrinter::StringElementType element_type>
-bool LibcxxStringSummaryProvider(ValueObject &valobj, Stream &stream,
- const TypeSummaryOptions &summary_options,
- std::string prefix_token) {
+bool lldb_private::formatters::LibcxxWStringSummaryProvider(
+ ValueObject &valobj, Stream &stream,
+ const TypeSummaryOptions &summary_options) {
auto string_info = ExtractLibcxxStringInfo(valobj);
if (!string_info)
return false;
@@ -725,7 +718,19 @@
ValueObjectSP location_sp;
std::tie(size, location_sp) = *string_info;
+ return ::LibcxxWStringSummaryProvider(valobj, stream, summary_options,
+ location_sp, size);
+}
+
+template <StringPrinter::StringElementType element_type>
+static bool
+LibcxxStringSummaryProvider(ValueObject &valobj, Stream &stream,
+ const TypeSummaryOptions &summary_options,
+ std::string prefix_token, ValueObjectSP location_sp,
+ uint64_t size) {
+
if (size == 0) {
+ stream << prefix_token;
stream.Printf("\"\"");
return true;
}
@@ -762,6 +767,22 @@
return StringPrinter::ReadBufferAndDumpToStream<element_type>(options);
}
+template <StringPrinter::StringElementType element_type>
+static bool
+LibcxxStringSummaryProvider(ValueObject &valobj, Stream &stream,
+ const TypeSummaryOptions &summary_options,
+ std::string prefix_token) {
+ auto string_info = ExtractLibcxxStringInfo(valobj);
+ if (!string_info)
+ return false;
+ uint64_t size;
+ ValueObjectSP location_sp;
+ std::tie(size, location_sp) = *string_info;
+
+ return LibcxxStringSummaryProvider<element_type>(
+ valobj, stream, summary_options, prefix_token, location_sp, size);
+}
+
template <StringPrinter::StringElementType element_type>
static bool formatStringImpl(ValueObject &valobj, Stream &stream,
const TypeSummaryOptions &summary_options,
@@ -796,3 +817,62 @@
return formatStringImpl<StringPrinter::StringElementType::UTF32>(
valobj, stream, summary_options, "U");
}
+
+template <StringPrinter::StringElementType element_type>
+static bool formatStringViewImpl(ValueObject &valobj, Stream &stream,
+ const TypeSummaryOptions &summary_options,
+ std::string prefix_token) {
+
+ // extract the size/location from the string_view object
+ ConstString g_data_name("__data");
+ ConstString g_size_name("__size");
+ auto dataobj = valobj.GetChildMemberWithName(g_data_name, true);
+ auto sizeobj = valobj.GetChildMemberWithName(g_size_name, true);
+
+ if (!dataobj || !sizeobj)
+ return false;
+
+ uint64_t size = sizeobj->GetValueAsUnsigned(0);
+
+ return LibcxxStringSummaryProvider<element_type>(
+ valobj, stream, summary_options, prefix_token, dataobj, size);
+}
+
+bool lldb_private::formatters::LibcxxStringViewSummaryProviderASCII(
+ ValueObject &valobj, Stream &stream,
+ const TypeSummaryOptions &summary_options) {
+ return formatStringViewImpl<StringPrinter::StringElementType::ASCII>(
+ valobj, stream, summary_options, "");
+}
+
+bool lldb_private::formatters::LibcxxStringViewSummaryProviderUTF16(
+ ValueObject &valobj, Stream &stream,
+ const TypeSummaryOptions &summary_options) {
+ return formatStringViewImpl<StringPrinter::StringElementType::UTF16>(
+ valobj, stream, summary_options, "u");
+}
+
+bool lldb_private::formatters::LibcxxStringViewSummaryProviderUTF32(
+ ValueObject &valobj, Stream &stream,
+ const TypeSummaryOptions &summary_options) {
+ return formatStringViewImpl<StringPrinter::StringElementType::UTF32>(
+ valobj, stream, summary_options, "U");
+}
+
+bool lldb_private::formatters::LibcxxWStringViewSummaryProvider(
+ ValueObject &valobj, Stream &stream,
+ const TypeSummaryOptions &summary_options) {
+
+ ConstString g_data_name("__data");
+ ConstString g_size_name("__size");
+ auto dataobj = valobj.GetChildMemberWithName(g_data_name, true);
+ auto sizeobj = valobj.GetChildMemberWithName(g_size_name, true);
+
+ if (!dataobj || !sizeobj)
+ return false;
+
+ uint64_t size = sizeobj->GetValueAsUnsigned(0);
+
+ return ::LibcxxWStringSummaryProvider(valobj, stream, summary_options,
+ dataobj, size);
+}
Index: lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
===================================================================
--- lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
+++ lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
@@ -583,6 +583,51 @@
"std::__[[:alnum:]]+::allocator<wchar_t> >$"),
stl_summary_flags, true);
+ AddCXXSummary(cpp_category_sp,
+ lldb_private::formatters::LibcxxStringViewSummaryProviderASCII,
+ "std::string_view summary provider",
+ ConstString("^std::__[[:alnum:]]+::string_view$"),
+ stl_summary_flags, true);
+ AddCXXSummary(cpp_category_sp,
+ lldb_private::formatters::LibcxxStringViewSummaryProviderASCII,
+ "std::string_view summary provider",
+ ConstString("^std::__[[:alnum:]]+::basic_string_view<char, "
+ "std::__[[:alnum:]]+::char_traits<char> >$"),
+ stl_summary_flags, true);
+ AddCXXSummary(
+ cpp_category_sp,
+ lldb_private::formatters::LibcxxStringViewSummaryProviderASCII,
+ "std::string_view summary provider",
+ ConstString("^std::__[[:alnum:]]+::basic_string_view<unsigned char, "
+ "std::__[[:alnum:]]+::char_traits<unsigned char> >$"),
+ stl_summary_flags, true);
+
+ AddCXXSummary(cpp_category_sp,
+ lldb_private::formatters::LibcxxStringViewSummaryProviderUTF16,
+ "std::u16string_view summary provider",
+ ConstString("^std::__[[:alnum:]]+::basic_string_view<char16_t, "
+ "std::__[[:alnum:]]+::char_traits<char16_t> >$"),
+ stl_summary_flags, true);
+
+ AddCXXSummary(cpp_category_sp,
+ lldb_private::formatters::LibcxxStringViewSummaryProviderUTF32,
+ "std::u32string_view summary provider",
+ ConstString("^std::__[[:alnum:]]+::basic_string_view<char32_t, "
+ "std::__[[:alnum:]]+::char_traits<char32_t> >$"),
+ stl_summary_flags, true);
+
+ AddCXXSummary(cpp_category_sp,
+ lldb_private::formatters::LibcxxWStringViewSummaryProvider,
+ "std::wstring_view summary provider",
+ ConstString("^std::__[[:alnum:]]+::wstring_view$"),
+ stl_summary_flags, true);
+ AddCXXSummary(cpp_category_sp,
+ lldb_private::formatters::LibcxxWStringViewSummaryProvider,
+ "std::wstring_view summary provider",
+ ConstString("^std::__[[:alnum:]]+::basic_string_view<wchar_t, "
+ "std::__[[:alnum:]]+::char_traits<wchar_t> >$"),
+ stl_summary_flags, true);
+
SyntheticChildren::Flags stl_synth_flags;
stl_synth_flags.SetCascades(true).SetSkipPointers(false).SetSkipReferences(
false);
_______________________________________________
lldb-commits mailing list
lldb-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/lldb-commits
