Merge pull request swiftlang#32596 from mikeash/remotemirror-null-convertchild

mikeash · web-flow · commit 62ebcaeae74a · 2020-07-01T14:16:04.000-04:00
[RemoteMirror] Gracefully handle a NULL TypeInfo passed to convertChild.
diff --git a/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp b/stdlib/public/SwiftRemoteMirror/SwiftRemoteMirror.cpp
@@ -406,6 +406,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
`@@ -406,6 +406,9 @@ static swift_typeinfo_t convertTypeInfo(const TypeInfo *TI) {`
`406`	`406`	`}`
`407`	`407`
`408`	`408`	`static swift_childinfo_t convertChild(const TypeInfo *TI, unsigned Index) {`
	`409`	`+ if (!TI)`
	`410`	`+ return {};`
	`411`	`+`
`409`	`412`	`const FieldInfo *FieldInfo;`
`410`	`413`	`if (auto *EnumTI = dyn_cast<EnumTypeInfo>(TI)) {`
`411`	`414`	`FieldInfo = &(EnumTI->getCases()[Index]);`