[5.3][RemoteMirror] Gracefully handle a NULL TypeInfo passed to convertChild. (#32597)

mikeash · web-flow · commit 0cb3e3d1d796 · 2020-07-01T11:10:37.000-07:00
rdar://problem/64066210
diff --git a/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp b/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp
@@ -393,6 +393,9 @@ static swift_typeinfo_t convertTypeInfo(const TypeInfo *TI) {
 }
 
 static swift_childinfo_t convertChild(const TypeInfo *TI, unsigned Index) {
+  if (!TI)
+    return {};
+
   const FieldInfo *FieldInfo;
   if (auto *EnumTI = dyn_cast<EnumTypeInfo>(TI)) {
     FieldInfo = &(EnumTI->getCases()[Index]);

Original file line number	Diff line number	Diff line change
`@@ -393,6 +393,9 @@ static swift_typeinfo_t convertTypeInfo(const TypeInfo *TI) {`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`static swift_childinfo_t convertChild(const TypeInfo *TI, unsigned Index) {`
	`396`	`+ if (!TI)`
	`397`	`+ return {};`
	`398`	`+`
`396`	`399`	`const FieldInfo *FieldInfo;`
`397`	`400`	`if (auto *EnumTI = dyn_cast<EnumTypeInfo>(TI)) {`
`398`	`401`	`FieldInfo = &(EnumTI->getCases()[Index]);`