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

[CSSolver] Split `getType(ValueDecl*) into three - getType{OrNull, OrInterfaceType}

Browse Source
This commit is contained in:
Pavel Yaskevich
2018-06-05 23:38:22 -07:00
parent 398abdfb7c
commit d62be440ce
2 changed files with 18 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
lib/Sema/ConstraintSystem.cpp
View File

@@ -1017,7 +1017,7 @@ ConstraintSystem::getTypeOfReference(ValueDecl *value,
// Determine the type of the value, opening up that type if necessary.
bool wantInterfaceType = !varDecl->getDeclContext()->isLocalContext();
Type valueType = TC.getUnopenedTypeOfReference(
varDecl, Type(), DC, getType(varDecl, false), base, wantInterfaceType);
varDecl, Type(), DC, getTypeOrNull(varDecl), base, wantInterfaceType);
assert(!valueType->hasUnboundGenericType() &&
!valueType->hasTypeParameter());
@@ -1338,8 +1338,8 @@ ConstraintSystem::getTypeOfMemberReference(
AnyFunctionType::ExtInfo());
} else {
refType = TC.getUnopenedTypeOfReference(cast<VarDecl>(value), baseTy,
useDC, getType(value, false),
base, /*wantInterfaceType=*/true);
useDC, getTypeOrNull(value), base,
/*wantInterfaceType=*/true);
}
auto selfTy = outerDC->getSelfInterfaceType();