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 pull request #23358 from brentdax/a-type-is-a-set-of-its-instances

Browse Source 
Add static and class subscripts
This commit is contained in:
Brent Royal-Gordon
2019-04-11 12:58:32 -07:00
committed by GitHub
parent cfc03f85b6 7ae331dbca
commit def1af6049
28 changed files with 708 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Sema/CSApply.cpp
View File

@@ -1376,6 +1376,12 @@ namespace {
auto &tc = cs.getTypeChecker();
auto baseTy = cs.getType(base)->getRValueType();
bool baseIsInstance = true;
if (auto baseMeta = baseTy->getAs<AnyMetatypeType>()) {
baseIsInstance = false;
baseTy = baseMeta->getInstanceType();
}
// Check whether the base is 'super'.
bool isSuper = base->isSuperExpr();
@@ -1461,9 +1467,22 @@ namespace {
auto openedBaseType =
getBaseType(openedFullFnType, /*wantsRValue*/ false);
auto containerTy = solution.simplifyType(openedBaseType);
base = coerceObjectArgumentToType(
base, containerTy, subscript, AccessSemantics::Ordinary,
locator.withPathElement(ConstraintLocator::MemberRefBase));
if (baseIsInstance) {
base = coerceObjectArgumentToType(
base, containerTy, subscript, AccessSemantics::Ordinary,
locator.withPathElement(ConstraintLocator::MemberRefBase));
} else {
base = coerceToType(base,
MetatypeType::get(containerTy),
locator.withPathElement(
ConstraintLocator::MemberRefBase));
if (!base)
return nullptr;
base = cs.coerceToRValue(base);
}
if (!base)
return nullptr;