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

[Constraint solver] Minor cleanup for @optional declarations.

Browse Source
This commit is contained in:
Doug Gregor
2019-03-01 22:48:46 -08:00
parent 6246e7e1db
commit e5613296fd
1 changed files with 7 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
lib/Sema/ConstraintSystem.cpp
View File

@@ -1526,8 +1526,7 @@ Type ConstraintSystem::getEffectiveOverloadType(const OverloadChoice &overload,
// See ConstraintSystem::resolveOverload() -- optional and dynamic
// subscripts are a special case, because the optionality is
// applied to the result type and not the type of the reference.
if (subscript->getAttrs().hasAttribute<OptionalAttr>() ||
overload.getKind() == OverloadChoiceKind::DeclViaDynamic)
if (subscript->getAttrs().hasAttribute<OptionalAttr>())
elementTy = OptionalType::get(elementTy->getRValueType());
auto indices = subscript->getInterfaceType()
@@ -1559,11 +1558,14 @@ Type ConstraintSystem::getEffectiveOverloadType(const OverloadChoice &overload,
}
type = type->castTo<FunctionType>()->getResult();
} else {
return type;
}
}
// Handle "@objc optional" for non-subscripts; subscripts are handled above.
if (decl->getAttrs().hasAttribute<OptionalAttr>() &&
!isa<SubscriptDecl>(decl))
type = OptionalType::get(type->getRValueType());
return type;
}
@@ -1821,7 +1823,7 @@ Type ConstraintSystem::findCommonOverloadType(
// If we can't even get a type for the overload, there's nothing more to
// do.
Type overloadType =
getEffectiveOverloadType(overload, /*allowMembers=*/false, /*FIXME:*/DC);
getEffectiveOverloadType(overload, /*allowMembers=*/false, /*FIXME:*/DC);
if (!overloadType) {
return true;
}