Merge pull request #11076 from slavapestov/a-dave-abrahams-special

slavapestov · web-flow · commit f2873ea25d43 · 2017-07-19T23:33:15.000-07:00
AST: Check return value of ProtocolConformance::getTypeWitness()
diff --git a/lib/AST/GenericSignatureBuilder.cpp b/lib/AST/GenericSignatureBuilder.cpp
@@ -1688,6 +1688,7 @@ static void concretizeNestedTypeFromConcreteParent(
     witnessType =
       conformance.getConcrete()
         ->getTypeWitness(assocType, builder.getLazyResolver());
+    if (!witnessType) return;
   } else {
     witnessType = DependentMemberType::get(concreteParent, assocType);
   }

Original file line number	Diff line number	Diff line change
`@@ -1688,6 +1688,7 @@ static void concretizeNestedTypeFromConcreteParent(`
`1688`	`1688`	`witnessType =`
`1689`	`1689`	`conformance.getConcrete()`
`1690`	`1690`	`->getTypeWitness(assocType, builder.getLazyResolver());`
	`1691`	`+ if (!witnessType) return;`
`1691`	`1692`	`} else {`
`1692`	`1693`	`witnessType = DependentMemberType::get(concreteParent, assocType);`
`1693`	`1694`	`}`