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

Sema: Remove OverloadChoiceKind::TypeDecl, which was never used

Browse Source
This commit is contained in:
Slava Pestov
2017-05-22 19:56:13 -07:00
parent 3b8fdcdca7
commit a6dfcd52cf
9 changed files with 7 additions and 61 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Sema/ConstraintSystem.cpp
View File

@@ -714,7 +714,6 @@ static unsigned getNumRemovedArgumentLabels(ASTContext &ctx, ValueDecl *decl,
std::pair<Type, Type>
ConstraintSystem::getTypeOfReference(ValueDecl *value,
bool isTypeReference,
bool isSpecialized,
FunctionRefKind functionRefKind,
ConstraintLocatorBuilder locator,
@@ -770,8 +769,8 @@ ConstraintSystem::getTypeOfReference(ValueDecl *value,
// If we opened up any type variables, record the replacements.
recordOpenedTypes(locator, replacements);
// If it's a type reference or it's a module type, we're done.
if (isTypeReference || type->is<ModuleType>())
// Module types are not wrapped in metatypes.
if (type->is<ModuleType>())
return { type, type };
// If it's a value reference, refer to the metatype.
@@ -1023,7 +1022,6 @@ static bool isRequirementOrWitness(const ConstraintLocatorBuilder &locator) {
std::pair<Type, Type>
ConstraintSystem::getTypeOfMemberReference(
Type baseTy, ValueDecl *value, DeclContext *useDC,
bool isTypeReference,
bool isDynamicResult,
FunctionRefKind functionRefKind,
ConstraintLocatorBuilder locator,
@@ -1039,7 +1037,7 @@ ConstraintSystem::getTypeOfMemberReference(
// If the base is a module type, just use the type of the decl.
if (baseObjTy->is<ModuleType>()) {
return getTypeOfReference(value, isTypeReference, /*isSpecialized=*/false,
return getTypeOfReference(value, /*isSpecialized=*/false,
functionRefKind, locator, base);
}
@@ -1059,8 +1057,7 @@ ConstraintSystem::getTypeOfMemberReference(
// Refer to a member of the archetype directly.
auto archetype = baseObjTy->castTo<ArchetypeType>();
Type memberTy = archetype->getNestedType(value->getName());
if (!isTypeReference)
memberTy = MetatypeType::get(memberTy);
memberTy = MetatypeType::get(memberTy);
auto openedType = FunctionType::get(baseObjTy, memberTy);
return { openedType, memberTy };
@@ -1099,10 +1096,6 @@ ConstraintSystem::getTypeOfMemberReference(
// Remove argument labels, if needed.
openedType = removeArgumentLabels(openedType, numRemovedArgumentLabels);
// If we have a type reference, look through the metatype.
if (isTypeReference)
openedType = openedType->castTo<AnyMetatypeType>()->getInstanceType();
// Open up the generic parameter list for the container.
openGeneric(innerDC, outerDC, innerDC->getGenericSignatureOfContext(),
/*skipProtocolSelfConstraint=*/true,
@@ -1396,10 +1389,7 @@ void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
case OverloadChoiceKind::DeclViaBridge:
case OverloadChoiceKind::DeclViaDynamic:
case OverloadChoiceKind::DeclViaUnwrappedOptional:
case OverloadChoiceKind::TypeDecl: {
bool isTypeReference = choice.getKind() == OverloadChoiceKind::TypeDecl;
case OverloadChoiceKind::DeclViaUnwrappedOptional: {
bool isDynamicResult
= choice.getKind() == OverloadChoiceKind::DeclViaDynamic;
// Retrieve the type of a reference to the specific declaration choice.
@@ -1425,12 +1415,12 @@ void ConstraintSystem::resolveOverload(ConstraintLocator *locator,
auto base = getDotBase(anchor);
std::tie(openedFullType, refType)
= getTypeOfMemberReference(baseTy, choice.getDecl(), useDC,
isTypeReference, isDynamicResult,
isDynamicResult,
choice.getFunctionRefKind(),
locator, base, nullptr);
} else {
std::tie(openedFullType, refType)
= getTypeOfReference(choice.getDecl(), isTypeReference,
= getTypeOfReference(choice.getDecl(),
choice.isSpecialized(),
choice.getFunctionRefKind(), locator);
}
@@ -1716,7 +1706,6 @@ DeclName OverloadChoice::getName() const {
switch (getKind()) {
case OverloadChoiceKind::Decl:
case OverloadChoiceKind::DeclViaDynamic:
case OverloadChoiceKind::TypeDecl:
case OverloadChoiceKind::DeclViaBridge:
case OverloadChoiceKind::DeclViaUnwrappedOptional:
return getDecl()->getFullName();