Sema: Stop producing SubstitutedType for typealias member lookup

slavapestov · slavapestov · commit fcef5285eba4 · 2016-12-04T23:57:11.000-08:00
diff --git a/lib/Sema/TypeCheckType.cpp b/lib/Sema/TypeCheckType.cpp
@@ -570,13 +570,7 @@ Type TypeChecker::applyUnboundGenericArguments(
       type = ArchetypeBuilder::mapTypeOutOfContext(TAD, TAD->getUnderlyingType());
     }
 
-    type = type.subst(dc->getParentModule(), subs, SubstFlags::UseErrorType);
-
-    // FIXME: return a SubstitutedType to preserve the fact that
-    // we resolved a generic TypeAlias, for availability diagnostics.
-    // A better fix might be to introduce a BoundGenericAliasType
-    // which desugars as appropriate.
-    return SubstitutedType::get(TAD->getAliasType(), type, Context);
+    return type.subst(dc->getParentModule(), subs, SubstFlags::UseErrorType);
   }
   
   // Form the bound generic type.

Original file line number	Diff line number	Diff line change
`@@ -570,13 +570,7 @@ Type TypeChecker::applyUnboundGenericArguments(`
`570`	`570`	`type = ArchetypeBuilder::mapTypeOutOfContext(TAD, TAD->getUnderlyingType());`
`571`	`571`	`}`
`572`	`572`
`573`		`- type = type.subst(dc->getParentModule(), subs, SubstFlags::UseErrorType);`
`574`		`-`
`575`		`- // FIXME: return a SubstitutedType to preserve the fact that`
`576`		`- // we resolved a generic TypeAlias, for availability diagnostics.`
`577`		`- // A better fix might be to introduce a BoundGenericAliasType`
`578`		`- // which desugars as appropriate.`
`579`		`- return SubstitutedType::get(TAD->getAliasType(), type, Context);`
	`573`	`+ return type.subst(dc->getParentModule(), subs, SubstFlags::UseErrorType);`
`580`	`574`	`}`
`581`	`575`
`582`	`576`	`// Form the bound generic type.`