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

[Type checker] Eliminate most uses of PartialGenericTypeToArchetypeResolver.

Browse Source 
PartialGenericTypeToArchetypeResolver is (eventually) going
away. Isolate it's use to those places where we still rely on its odd
behavior.
This commit is contained in:
Doug Gregor
2016-12-05 15:37:08 -08:00
parent 38671e2771
commit 7349dca8dd
5 changed files with 21 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Sema/ITCDecl.cpp
View File

@@ -103,7 +103,7 @@ void IterativeTypeChecker::processResolveInheritedClauseEntry(
// Validate the type of this inherited clause entry.
// FIXME: Recursion into existing type checker.
PartialGenericTypeToArchetypeResolver resolver;
GenericTypeToArchetypeResolver resolver(dc->getGenericEnvironmentOfContext());
if (TC.validateType(*inherited, dc, options, &resolver)) {
inherited->setInvalidType(getASTContext());
}
@@ -314,9 +314,10 @@ void IterativeTypeChecker::processResolveTypeDecl(
// Note: recursion into old type checker is okay when passing in an
// unsatisfied-dependency callback.
GenericTypeToArchetypeResolver resolver(typeAliasDecl);
if (TC.validateType(typeAliasDecl->getUnderlyingTypeLoc(),
typeAliasDecl->getDeclContext(),
options, nullptr, &unsatisfiedDependency)) {
options, &resolver, &unsatisfiedDependency)) {
typeAliasDecl->setInvalid();
typeAliasDecl->setInterfaceType(ErrorType::get(getASTContext()));
typeAliasDecl->getUnderlyingTypeLoc().setInvalidType(getASTContext());