averello/swift-mirror
1
0
Fork 0
mirror of https://github.com/apple/swift.git synced 2025-12-21 12:14:44 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into remove-swift-3-in-expr-typechecking

Browse Source
This commit is contained in:
Mark Lacey
2018-07-11 20:55:32 -07:00
parent 28f759c8b0 3906b35e44
commit aa30cc5adc
244 changed files with 9974 additions and 4467 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Sema/CSApply.cpp
View File

@@ -320,6 +320,9 @@ static bool isNonFinalClass(Type type) {
if (auto super = archetype->getSuperclass())
return isNonFinalClass(super);
if (type->isExistentialType())
return true;
return false;
}
@@ -5465,9 +5468,11 @@ Expr *ExprRewriter::coerceExistential(Expr *expr, Type toType,
Type toInstanceType = toType;
// Look through metatypes
while (fromInstanceType->is<AnyMetatypeType>() &&
while ((fromInstanceType->is<UnresolvedType>() ||
fromInstanceType->is<AnyMetatypeType>()) &&
toInstanceType->is<ExistentialMetatypeType>()) {
fromInstanceType = fromInstanceType->castTo<AnyMetatypeType>()->getInstanceType();
if (!fromInstanceType->is<UnresolvedType>())
fromInstanceType = fromInstanceType->castTo<AnyMetatypeType>()->getInstanceType();
toInstanceType = toInstanceType->castTo<ExistentialMetatypeType>()->getInstanceType();
}