Merge pull request #4368 from slavapestov/fix-corelibs-foundation

slavapestov · web-flow · commit 31bbb2c208ed · 2016-08-18T00:41:18.000-07:00
Strange fix for swift-corelibs-foundation build
diff --git a/lib/Sema/TypeCheckType.cpp b/lib/Sema/TypeCheckType.cpp
@@ -1715,7 +1715,7 @@ Type TypeResolver::resolveType(TypeRepr *repr, TypeResolutionOptions options) {
     if (!(options & TR_SILType)) {
       // Default non-escaping for closure parameters
       auto result = resolveASTFunctionType(cast<FunctionTypeRepr>(repr), options);
-      if (result->is<FunctionType>())
+      if (result && result->is<FunctionType>())
         return adjustFunctionExtInfo(DC, result, options);
       return result;
     }

Original file line number	Diff line number	Diff line change
`@@ -1715,7 +1715,7 @@ Type TypeResolver::resolveType(TypeRepr *repr, TypeResolutionOptions options) {`
`1715`	`1715`	`if (!(options & TR_SILType)) {`
`1716`	`1716`	`// Default non-escaping for closure parameters`
`1717`	`1717`	`auto result = resolveASTFunctionType(cast<FunctionTypeRepr>(repr), options);`
`1718`		`- if (result->is<FunctionType>())`
	`1718`	`+ if (result && result->is<FunctionType>())`
`1719`	`1719`	`return adjustFunctionExtInfo(DC, result, options);`
`1720`	`1720`	`return result;`
`1721`	`1721`	`}`