TypeAliasDecl::getStructuralType returns a validated type if available

Author: xymus

lib/AST/Decl.cpp

@@ -3624,7 +3624,10 @@ UnboundGenericType *TypeAliasDecl::getUnboundGenericType() const {
 
 Type TypeAliasDecl::getStructuralType() const {
   assert(!getGenericParams());
-  
+
+  if (auto resolved = this->getUnderlyingTypeLoc().getType())
+    return resolved;
+
   auto &context = getASTContext();
   return evaluateOrDefault(context.evaluator,
                            StructuralTypeRequest { const_cast<TypeAliasDecl *>(this) },

lib/AST/GenericSignatureBuilder.cpp

@@ -3785,9 +3785,6 @@ PotentialArchetype *GenericSignatureBuilder::realizePotentialArchetype(
 
 static Type getStructuralType(TypeDecl *typeDecl) {
   if (auto typealias = dyn_cast<TypeAliasDecl>(typeDecl)) {
-    if (auto resolved = typealias->getUnderlyingTypeLoc().getType())
-      return resolved;
-
     return typealias->getStructuralType();
   }