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 #39652 from AnthonyLatsis/no-context

Browse Source 
TypeResolution: Abolish TypeResolutionStage::Contextual
This commit is contained in:
Anthony Latsis
2021-11-29 16:44:27 +03:00
committed by GitHub
parent d835783bc4 f0264defaa
commit 9fc633e0b8
28 changed files with 434 additions and 440 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
lib/Sema/ConstraintSystem.cpp
View File

@@ -628,8 +628,10 @@ Optional<std::pair<unsigned, Expr *>> ConstraintSystem::getExprDepthAndParent(
return None;
}
Type ConstraintSystem::openUnboundGenericType(
GenericTypeDecl *decl, Type parentTy, ConstraintLocatorBuilder locator) {
Type ConstraintSystem::openUnboundGenericType(GenericTypeDecl *decl,
Type parentTy,
ConstraintLocatorBuilder locator,
bool isTypeResolution) {
if (parentTy) {
parentTy = replaceInferableTypesWithTypeVars(parentTy, locator);
}
@@ -642,7 +644,15 @@ Type ConstraintSystem::openUnboundGenericType(
recordOpenedTypes(locator, replacements);
if (parentTy) {
auto subs = parentTy->getContextSubstitutions(decl->getDeclContext());
const auto parentTyInContext =
isTypeResolution
// Type resolution produces interface types, so we have to map
// the parent type into context before binding type variables.
? DC->mapTypeIntoContext(parentTy)
: parentTy;
const auto subs =
parentTyInContext->getContextSubstitutions(decl->getDeclContext());
for (auto pair : subs) {
auto found = replacements.find(
cast<GenericTypeParamType>(pair.first));
@@ -670,9 +680,17 @@ Type ConstraintSystem::openUnboundGenericType(
// pointing at a generic TypeAliasDecl here. If we find a way to
// handle generic TypeAliases elsewhere, this can just become a
// call to BoundGenericType::get().
return TypeResolution::forContextual(DC, None, /*unboundTyOpener*/ nullptr,
/*placeholderHandler*/ nullptr)
.applyUnboundGenericArguments(decl, parentTy, SourceLoc(), arguments);
auto result =
TypeResolution::forInterface(
DC, None,
[](auto) -> Type { llvm_unreachable("should not be used"); },
[](auto &, auto) -> Type { llvm_unreachable("should not be used"); })
.applyUnboundGenericArguments(decl, parentTy, SourceLoc(), arguments);
if (!parentTy && !isTypeResolution) {
result = DC->mapTypeIntoContext(result);
}
return result;
}
static void checkNestedTypeConstraints(ConstraintSystem &cs, Type type,
@@ -756,15 +774,13 @@ static void checkNestedTypeConstraints(ConstraintSystem &cs, Type type,
Type ConstraintSystem::replaceInferableTypesWithTypeVars(
Type type, ConstraintLocatorBuilder locator) {
assert(!type->getCanonicalType()->hasTypeParameter());
if (!type->hasUnboundGenericType() && !type->hasPlaceholder())
return type;
type = type.transform([&](Type type) -> Type {
if (auto unbound = type->getAs<UnboundGenericType>()) {
return openUnboundGenericType(unbound->getDecl(), unbound->getParent(),
locator);
locator, /*isTypeResolution=*/false);
} else if (auto *placeholderTy = type->getAs<PlaceholderType>()) {
if (auto *placeholderRepr = placeholderTy->getOriginator()
.dyn_cast<PlaceholderTypeRepr *>()) {
@@ -1352,11 +1368,12 @@ ConstraintSystem::getTypeOfReference(ValueDecl *value,
if (auto typeDecl = dyn_cast<TypeDecl>(value)) {
// Resolve the reference to this type declaration in our current context.
auto type =
TypeResolution::forContextual(useDC, TypeResolverContext::InExpression,
/*unboundTyOpener*/ nullptr,
/*placeholderHandler*/ nullptr)
TypeResolution::forInterface(useDC, TypeResolverContext::InExpression,
/*unboundTyOpener*/ nullptr,
/*placeholderHandler*/ nullptr)
.resolveTypeInContext(typeDecl, /*foundDC*/ nullptr,
/*isSpecialized=*/false);
type = useDC->mapTypeIntoContext(type);
checkNestedTypeConstraints(*this, type, locator);
@@ -2406,11 +2423,10 @@ FunctionType::ExtInfo ConstraintSystem::closureEffects(ClosureExpr *expr) {
while (auto isp = dyn_cast<IsPattern>(pattern)) {
Type castType;
if (auto castTypeRepr = isp->getCastTypeRepr()) {
castType = TypeResolution::forContextual(
DC, TypeResolverContext::InExpression,
/*unboundTyOpener*/ nullptr,
/*placeholderHandler*/ nullptr)
.resolveType(castTypeRepr);
castType = TypeResolution::resolveContextualType(
castTypeRepr, DC, TypeResolverContext::InExpression,
/*unboundTyOpener*/ nullptr,
/*placeholderHandler*/ nullptr);
} else {
castType = isp->getCastType();
}