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

AST: Remove TypeBase::eraseDynamicSelfType()

Browse Source
This commit is contained in:
Slava Pestov
2019-06-26 16:27:48 -04:00
parent 3e3770fe42
commit 590ef2bdd3
4 changed files with 10 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
lib/Sema/ConstraintSystem.cpp
View File

@@ -907,16 +907,12 @@ ConstraintSystem::getTypeOfReference(ValueDecl *value,
// If this is a method whose result type is dynamic Self, replace
// DynamicSelf with the actual object type.
if (!func->getDeclContext()->getSelfProtocolDecl()) {
if (func->getResultInterfaceType()->hasDynamicSelfType()) {
auto params = openedType->getParams();
assert(params.size() == 1);
Type selfTy = params.front().getPlainType()->getMetatypeInstanceType();
openedType = openedType->replaceCovariantResultType(selfTy, 2)
->castTo<FunctionType>();
}
} else {
openedType = openedType->eraseDynamicSelfType()->castTo<FunctionType>();
if (func->getResultInterfaceType()->hasDynamicSelfType()) {
auto params = openedType->getParams();
assert(params.size() == 1);
Type selfTy = params.front().getPlainType()->getMetatypeInstanceType();
openedType = openedType->replaceCovariantResultType(selfTy, 2)
->castTo<FunctionType>();
}
// The reference implicitly binds 'self'.
@@ -1312,11 +1308,6 @@ ConstraintSystem::getTypeOfMemberReference(
openedType = openedType->replaceCovariantResultType(baseObjTy, 1);
}
}
} else {
// Protocol requirements returning Self have a dynamic Self return
// type. Erase the dynamic Self since it only comes into play during
// protocol conformance checking.
openedType = openedType->eraseDynamicSelfType();
}
// If we are looking at a member of an existential, open the existential.