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

Turn on metatype-to-object conversions.

Browse Source 
Swift SVN r18850
This commit is contained in:
Joe Groff
2014-06-13 01:01:38 +00:00
parent 23bf30e732
commit ca42a7b377
9 changed files with 55 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

84
lib/Sema/CSSimplify.cpp
View File

@@ -1633,53 +1633,51 @@ ConstraintSystem::matchTypes(Type type1, Type type2, TypeMatchKind kind,
// Metatype to object conversion.
if (getASTContext().LangOpts.EnableMetatypeToObjectConversions) {
// These conversions are between concrete types that don't need further
// resolution, so we can consider them immediately solved.
auto addSolvedRestrictedConstraint
= [&](ConversionRestrictionKind restriction) -> SolutionKind {
auto constraint = Constraint::createRestricted(*this,
ConstraintKind::Subtype,
restriction,
type1, type2,
getConstraintLocator(locator));
this->addConstraint(constraint);
return SolutionKind::Solved;
};
// These conversions are between concrete types that don't need further
// resolution, so we can consider them immediately solved.
auto addSolvedRestrictedConstraint
= [&](ConversionRestrictionKind restriction) -> SolutionKind {
auto constraint = Constraint::createRestricted(*this,
ConstraintKind::Subtype,
restriction,
type1, type2,
getConstraintLocator(locator));
this->addConstraint(constraint);
return SolutionKind::Solved;
};
if (auto meta1 = type1->getAs<MetatypeType>()) {
// Class metatypes can be converted to AnyObject.
if (meta1->getInstanceType()->mayHaveSuperclass()
&& type2->isAnyObject()) {
return addSolvedRestrictedConstraint(
ConversionRestrictionKind::ClassMetatypeToAnyObject);
}
// Single @objc protocol value metatypes can be converted to the ObjC
// Protocol class type.
auto isProtocolClassType = [&](Type t) -> bool {
if (auto classDecl = t->getClassOrBoundGenericClass())
if (classDecl->getName() == getASTContext().Id_Protocol
&& classDecl->getModuleContext()->Name
== getASTContext().Id_ObjectiveC)
return true;
return false;
};
if (auto meta1 = type1->getAs<MetatypeType>()) {
// Class metatypes can be converted to AnyObject.
if (meta1->getInstanceType()->mayHaveSuperclass()
&& type2->isAnyObject()) {
if (auto protoTy = meta1->getInstanceType()->getAs<ProtocolType>()) {
if (protoTy->getDecl()->isObjC()
&& isProtocolClassType(type2)) {
return addSolvedRestrictedConstraint(
ConversionRestrictionKind::ClassMetatypeToAnyObject);
}
// Single @objc protocol value metatypes can be converted to the ObjC
// Protocol class type.
auto isProtocolClassType = [&](Type t) -> bool {
if (auto classDecl = t->getClassOrBoundGenericClass())
if (classDecl->getName() == getASTContext().Id_Protocol
&& classDecl->getModuleContext()->Name
== getASTContext().Id_ObjectiveC)
return true;
return false;
};
if (auto protoTy = meta1->getInstanceType()->getAs<ProtocolType>()) {
if (protoTy->getDecl()->isObjC()
&& isProtocolClassType(type2)) {
return addSolvedRestrictedConstraint(
ConversionRestrictionKind::ProtocolMetatypeToProtocolClass);
}
ConversionRestrictionKind::ProtocolMetatypeToProtocolClass);
}
}
if (auto meta1 = type1->getAs<ExistentialMetatypeType>()) {
// Class-constrained existential metatypes can be converted to AnyObject.
if (meta1->getInstanceType()->isClassExistentialType()
&& type2->isAnyObject()) {
return addSolvedRestrictedConstraint(
ConversionRestrictionKind::ExistentialMetatypeToAnyObject);
}
}
if (auto meta1 = type1->getAs<ExistentialMetatypeType>()) {
// Class-constrained existential metatypes can be converted to AnyObject.
if (meta1->getInstanceType()->isClassExistentialType()
&& type2->isAnyObject()) {
return addSolvedRestrictedConstraint(
ConversionRestrictionKind::ExistentialMetatypeToAnyObject);
}
}