Skip to content

Commit f9957f0

Browse files
author
git apple-llvm automerger
committed
Merge commit 'a190d147ce89' from swift/release/5.3 into swift/master
2 parents 8d19c42 + a190d14 commit f9957f0

File tree

2 files changed

+6
-1
lines changed

2 files changed

+6
-1
lines changed

lldb/source/Plugins/Language/Swift/SwiftOptional.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -221,7 +221,7 @@ lldb::ValueObjectSP lldb_private::formatters::swift::
221221
if (IsEmpty())
222222
return nullptr;
223223
auto child = m_some->GetChildAtIndex(idx, true);
224-
if (m_some->IsSyntheticChildrenGenerated())
224+
if (child && m_some->IsSyntheticChildrenGenerated())
225225
child->SetSyntheticChildrenGenerated(true);
226226
return child;
227227
}

lldb/test/API/lang/swift/variables/optionals/TestSwiftOptionals.py

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,4 +102,9 @@ def do_check_api(self):
102102
uoptString_Some,
103103
use_dynamic=False,
104104
num_children=1)
105+
uoptString_Some.GetChildAtIndex(99)
105106

107+
# Querying a non-existing child should not crash.
108+
synth_valobj = self.frame().FindVariable("optString_Some")
109+
synth_valobj.SetSyntheticChildrenGenerated(True);
110+
self.assertEqual(synth_valobj.GetChildAtIndex(1).GetSummary(), None)

0 commit comments

Comments
 (0)