diff --git a/lldb/source/DataFormatters/TypeSummary.cpp b/lldb/source/DataFormatters/TypeSummary.cpp --- a/lldb/source/DataFormatters/TypeSummary.cpp +++ b/lldb/source/DataFormatters/TypeSummary.cpp @@ -123,6 +123,17 @@ std::string &dest, const TypeSummaryOptions &options) { dest.clear(); + + if (valobj && valobj->IsPointerType()) { + bool success = true; + if (!valobj->GetValueAsUnsigned(0, &success)) { + if (!success) + return false; + dest = "nullptr"; + return true; + } + } + StreamString stream; if (!m_impl || !m_impl(*valobj, stream, options)) return false; diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/TestDataFormatterLibcxxString.py @@ -77,6 +77,7 @@ '(%s::u32string) u32_empty = ""'%ns, '(%s::basic_string, ' '%s::allocator >) uchar = "aaaaa"'%(ns,ns,ns), + '(std::string *) null = nullptr', ]) self.runCmd("n") @@ -114,6 +115,7 @@ '(%s::u32string) u32_empty = ""'%ns, '(%s::basic_string, ' '%s::allocator >) uchar = "aaaaa"'%(ns,ns,ns), + '(std::string *) null = nullptr', ]) # The test assumes that std::string is in its cap-size-data layout. diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libcxx/string/main.cpp @@ -71,6 +71,7 @@ std::u32string u32_string(U"🍄🍅🍆🍌"); std::u32string u32_empty(U""); std::basic_string uchar(5, 'a'); + std::string *null = nullptr; #if _LIBCPP_ABI_VERSION == 1 std::string garbage1, garbage2, garbage3, garbage4, garbage5; diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/TestDataFormatterStdString.py @@ -59,6 +59,7 @@ var_q = self.frame().FindVariable('q') var_Q = self.frame().FindVariable('Q') var_uchar = self.frame().FindVariable('uchar') + var_null = self.frame().FindVariable('null') self.assertEqual(var_wempty.GetSummary(), 'L""', "wempty summary wrong") self.assertEqual( @@ -76,6 +77,7 @@ var_Q.GetSummary(), '"quite a long std::strin with lots of info inside it"', "Q summary wrong") self.assertEqual(var_uchar.GetSummary(), '"aaaaa"', "u summary wrong") + self.assertEqual(var_null.GetSummary(), 'nullptr', "null summary wrong") self.runCmd("next") diff --git a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp --- a/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp +++ b/lldb/test/API/functionalities/data-formatter/data-formatter-stl/libstdcpp/string/main.cpp @@ -10,6 +10,7 @@ std::string q("hello world"); std::string Q("quite a long std::strin with lots of info inside it"); std::basic_string uchar(5, 'a'); + std::string *null = nullptr; S.assign(L"!!!!!"); // Set break point at this line. return 0; }