---

yaml
---
r: 348593
b: refs/heads/master
c: 60aeca5
h: refs/heads/master
i:
  348591: a993c53

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: f580629c859d0816fbc8fe85f893b21dec6a2c97
+refs/heads/master: 60aeca5ba2cf4049594206d357a8c0b0c0f22506
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/AST/GenericSignatureBuilder.cpp

@@ -3786,12 +3786,13 @@ PotentialArchetype *GenericSignatureBuilder::realizePotentialArchetype(
 
 static Type getStructuralType(TypeDecl *typeDecl) {
   if (auto typealias = dyn_cast<TypeAliasDecl>(typeDecl)) {
-	// When we're computing requirement signatures, the structural type
-	// suffices.  Otherwise we'll potentially try to validate incomplete 
-	// requirements.
-	auto *proto = dyn_cast_or_null<ProtocolDecl>(typealias->getDeclContext()->getAsDecl());
-	if (proto && proto->isComputingRequirementSignature())
-		return typealias->getStructuralType();
+    // When we're computing requirement signatures, the structural type
+    // suffices.  Otherwise we'll potentially try to validate incomplete
+    // requirements.
+    auto *proto = dyn_cast_or_null<ProtocolDecl>(
+        typealias->getDeclContext()->getAsDecl());
+    if (proto && proto->isComputingRequirementSignature())
+      return typealias->getStructuralType();
     return typealias->getUnderlyingType();
   }
 

trunk/lib/Sema/TypeCheckDecl.cpp

@@ -4302,16 +4302,20 @@ ExtendedTypeRequest::evaluate(Evaluator &eval, ExtensionDecl *ext) const {
       // Nested Hack to break cycles if this is called before validation has
       // finished.
       if (aliasDecl->hasInterfaceType()) {
-        auto extendedNominal = aliasDecl->getDeclaredInterfaceType()->getAnyNominal();
+        auto extendedNominal =
+            aliasDecl->getDeclaredInterfaceType()->getAnyNominal();
         if (extendedNominal)
-          return TypeChecker::isPassThroughTypealias(aliasDecl, aliasDecl->getUnderlyingType(), extendedNominal)
-                      ? extendedType
-                      : extendedNominal->getDeclaredType();
+          return TypeChecker::isPassThroughTypealias(
+                     aliasDecl, aliasDecl->getUnderlyingType(), extendedNominal)
+                     ? extendedType
+                     : extendedNominal->getDeclaredType();
       } else {
-        if (auto ty = aliasDecl->getStructuralType()->getAs<NominalOrBoundGenericNominalType>())
-          return TypeChecker::isPassThroughTypealias(aliasDecl, ty, ty->getDecl())
-                 ? extendedType
-                 : ty->getDecl()->getDeclaredType();
+        if (auto ty = aliasDecl->getStructuralType()
+                          ->getAs<NominalOrBoundGenericNominalType>())
+          return TypeChecker::isPassThroughTypealias(aliasDecl, ty,
+                                                     ty->getDecl())
+                     ? extendedType
+                     : ty->getDecl()->getDeclaredType();
       }
     }
   }

trunk/lib/Sema/TypeCheckGeneric.cpp

@@ -556,7 +556,8 @@ static Type formExtensionInterfaceType(
   }
 
   // If we have a typealias, try to form type sugar.
-  if (typealias && TypeChecker::isPassThroughTypealias(typealias, typealias->getUnderlyingType(), nominal)) {
+  if (typealias && TypeChecker::isPassThroughTypealias(
+                       typealias, typealias->getUnderlyingType(), nominal)) {
     auto typealiasSig = typealias->getGenericSignature();
     SubstitutionMap subMap;
     if (typealiasSig) {
@@ -565,10 +566,10 @@ static Type formExtensionInterfaceType(
       mustInferRequirements = true;
     }
 
-    resultType = TypeAliasType::get(typealias, parentType, subMap,
-                                    resultType);
+    resultType = TypeAliasType::get(typealias, parentType, subMap, resultType);
   }
 
+
   return resultType;
 }
 

trunk/lib/Serialization/Deserialization.cpp

@@ -2292,15 +2292,7 @@ class swift::DeclDeserializer {
 
     auto underlying = MF.getType(underlyingTypeID);
     alias->setUnderlyingType(underlying);
-    SubstitutionMap subs;
-    if (genericSig) {
-      subs = genericSig->getIdentitySubstitutionMap();
-    }
-    Type parent;
-    if (DC->isTypeContext())
-      parent = DC->getDeclaredInterfaceType();
-    auto sugaredType = TypeAliasType::get(alias, parent, subs, underlying);
-    alias->setInterfaceType(MetatypeType::get(sugaredType, ctx));
+    alias->computeType();
     alias->setValidationToChecked();
 
     if (auto accessLevel = getActualAccessLevel(rawAccessLevel))