Skip to content

Commit ee24302

Browse files
committed
fix: print "Summary Unavailable" if size can't be read
1 parent 87f45bf commit ee24302

File tree

2 files changed

+6
-8
lines changed

2 files changed

+6
-8
lines changed

lldb/source/Plugins/Language/CPlusPlus/MsvcStl.cpp

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -123,8 +123,10 @@ static bool formatStringViewImpl(ValueObject &valobj, Stream &stream,
123123

124124
bool success = false;
125125
uint64_t size = size_sp->GetValueAsUnsigned(0, &success);
126-
if (!success)
127-
return false;
126+
if (!success) {
127+
stream << "Summary Unavailable";
128+
return true;
129+
}
128130

129131
StreamString scratch_stream;
130132
success = StringBufferSummaryProvider<element_type>(

lldb/test/API/functionalities/data-formatter/data-formatter-stl/generic/string_view/TestDataFormatterStdStringView.py

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -82,8 +82,7 @@ def cleanup():
8282
# GetSummary returns None so can't be checked by expect_var_path, so we
8383
# use the str representation instead
8484
null_obj = self.frame().GetValueForVariablePath("null_str")
85-
null_summary = null_obj.GetSummary()
86-
self.assertTrue(null_summary == "Summary Unavailable" or null_summary is None)
85+
self.assertEqual(null_obj.GetSummary(), "Summary Unavailable")
8786
self.assertEqual(str(null_obj), "(std::string_view *) null_str = nullptr")
8887

8988
self.runCmd("n")
@@ -149,10 +148,7 @@ def cleanup():
149148
)
150149

151150
broken_obj = self.frame().GetValueForVariablePath("in_str_view")
152-
broken_summary = broken_obj.GetSummary()
153-
self.assertTrue(
154-
broken_summary == "Summary Unavailable" or broken_summary is None
155-
)
151+
self.assertEqual(broken_obj.GetSummary(), "Summary Unavailable")
156152

157153
@expectedFailureAll(
158154
bugnumber="llvm.org/pr36109", debug_info="gmodules", triple=".*-android"

0 commit comments

Comments
 (0)