[Request-Evaluator] Introduce a request for getting an "inherited type".

DougGregor · DougGregor · commit 2b2e143f59c6 · 2018-06-14T15:29:57.000-07:00
diff --git a/include/swift/AST/Decl.h b/include/swift/AST/Decl.h
@@ -1661,6 +1661,9 @@ class ExtensionDecl final : public GenericContext, public Decl,
 
   void setInherited(MutableArrayRef<TypeLoc> i) { Inherited = i; }
 
+  /// Retrieve one of the types listed in the "inherited" clause.
+  Type getInheritedType(unsigned index) const;
+
   /// Whether we have fully checked the extension.
   bool hasValidSignature() const {
     return hasValidationStarted() && !isBeingValidated();
@@ -2496,6 +2499,9 @@ class TypeDecl : public ValueDecl {
   MutableArrayRef<TypeLoc> getInherited() { return Inherited; }
   ArrayRef<TypeLoc> getInherited() const { return Inherited; }
 
+  /// Retrieve one of the types listed in the "inherited" clause.
+  Type getInheritedType(unsigned index) const;
+
   /// Whether we already type-checked the inheritance clause.
   bool checkedInheritanceClause() const {
     return Bits.TypeDecl.CheckedInheritanceClause;
diff --git a/include/swift/AST/LazyResolver.h b/include/swift/AST/LazyResolver.h
@@ -71,12 +71,6 @@ class LazyResolver {
   /// Resolve the "is Objective-C" bit for the given declaration.
   virtual void resolveIsObjC(ValueDecl *VD) = 0;
 
-  /// Resolve the types in the inheritance clause of the given
-  /// declaration context, which will be a type declaration or
-  /// extension declaration.
-  virtual void resolveInheritanceClause(
-                 llvm::PointerUnion<TypeDecl *, ExtensionDecl *> decl) = 0;
-
   /// Retrieve the superclass of the given class.
   virtual Type getSuperclass(const ClassDecl *classDecl) = 0;
 
@@ -86,6 +80,14 @@ class LazyResolver {
   /// Resolve the inherited protocols of a given protocol.
   virtual void resolveInheritedProtocols(ProtocolDecl *protocol) = 0;
 
+  /// Get a specific inherited type from the given declaration.
+  virtual Type getInheritedType(
+                        llvm::PointerUnion<TypeDecl *, ExtensionDecl *> decl,
+                        unsigned index) = 0;
+
+  /// Resolve the trailing where clause of the given protocol in-place.
+  virtual void resolveTrailingWhereClause(ProtocolDecl *proto) = 0;
+
   /// Bind an extension to its extended type.
   virtual void bindExtension(ExtensionDecl *ext) = 0;
 
diff --git a/lib/AST/ConformanceLookupTable.cpp b/lib/AST/ConformanceLookupTable.cpp
@@ -292,11 +292,8 @@ void ConformanceLookupTable::updateLookupTable(NominalTypeDecl *nominal,
     forEachInStage(
         stage, nominal, resolver,
         [&](NominalTypeDecl *nominal) {
-          if (resolver)
-            resolver->resolveInheritanceClause(nominal);
-
-          addProtocols(nominal->getInherited(),
-                       ConformanceSource::forExplicit(nominal), resolver);
+          addInheritedProtocols(nominal,
+                                ConformanceSource::forExplicit(nominal));
         },
         [&](ExtensionDecl *ext,
             ArrayRef<LazyResolver::ConformanceConstructionInfo> protos) {
@@ -484,17 +481,25 @@ bool ConformanceLookupTable::addProtocol(ProtocolDecl *protocol, SourceLoc loc,
   return true;
 }
 
-void ConformanceLookupTable::addProtocols(ArrayRef<TypeLoc> inherited,
-                                          ConformanceSource source,
-                                          LazyResolver *resolver) {
+void ConformanceLookupTable::addInheritedProtocols(
+                          llvm::PointerUnion<TypeDecl *, ExtensionDecl *> decl,
+                          ConformanceSource source) {
   // Visit each of the types in the inheritance list to find
   // protocols.
-  for (const auto &entry : inherited) {
-    if (!entry.getType() || !entry.getType()->isExistentialType())
+  auto typeDecl = decl.dyn_cast<TypeDecl *>();
+  auto extDecl = decl.dyn_cast<ExtensionDecl *>();
+  unsigned numInherited = typeDecl ? typeDecl->getInherited().size()
+                                   : extDecl->getInherited().size();
+  for (auto index : range(numInherited)) {
+    Type inheritedType = typeDecl ? typeDecl->getInheritedType(index)
+                                  : extDecl->getInheritedType(index);
+    if (!inheritedType || !inheritedType->isExistentialType())
       continue;
-    auto layout = entry.getType()->getExistentialLayout();
+    SourceLoc loc = typeDecl ? typeDecl->getInherited()[index].getLoc()
+                             : extDecl->getInherited()[index].getLoc();
+    auto layout = inheritedType->getExistentialLayout();
     for (auto *proto : layout.getProtocols())
-      addProtocol(proto->getDecl(), entry.getLoc(), source);
+      addProtocol(proto->getDecl(), loc, source);
   }
 }
 
@@ -512,15 +517,6 @@ void ConformanceLookupTable::expandImpliedConformances(NominalTypeDecl *nominal,
     ConformanceEntry *conformanceEntry = AllConformances[dc][i];
     ProtocolDecl *conformingProtocol = conformanceEntry->getProtocol();
 
-    // Visit the protocols inherited by this protocol, adding them as
-    // implied conformances.
-    if (resolver) {
-      if (nominal == dc)
-        resolver->resolveInheritanceClause(nominal);
-      else
-        resolver->resolveInheritanceClause(cast<ExtensionDecl>(dc));
-    }
-
     // An @objc enum that explicitly conforms to the Error protocol
     // also implicitly conforms to _ObjectiveCBridgeableError, via the
     // known protocol _BridgedNSError.
@@ -537,10 +533,8 @@ void ConformanceLookupTable::expandImpliedConformances(NominalTypeDecl *nominal,
       }
     }
 
-    // Add inherited protocols.
-    addProtocols(conformingProtocol->getInherited(),
-                 ConformanceSource::forImplied(conformanceEntry),
-                 resolver);
+    addInheritedProtocols(conformingProtocol,
+                          ConformanceSource::forImplied(conformanceEntry));
   }
 }
 
diff --git a/lib/AST/ConformanceLookupTable.h b/lib/AST/ConformanceLookupTable.h
@@ -335,8 +335,9 @@ class ConformanceLookupTable {
                    ConformanceSource source);
 
   /// Add the protocols from the given list.
-  void addProtocols(ArrayRef<TypeLoc> inherited,
-                    ConformanceSource source, LazyResolver *resolver);
+  void addInheritedProtocols(
+                         llvm::PointerUnion<TypeDecl *, ExtensionDecl *> decl,
+                         ConformanceSource source);
 
   /// Expand the implied conformances for the given DeclContext.
   void expandImpliedConformances(NominalTypeDecl *nominal, DeclContext *dc,
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -942,6 +942,16 @@ ExtensionDecl::takeConformanceLoaderSlow() {
   return { contextInfo->loader, contextInfo->allConformancesData };
 }
 
+Type ExtensionDecl::getInheritedType(unsigned index) const {
+  ASTContext &ctx = getASTContext();
+  if (auto lazyResolver = ctx.getLazyResolver()) {
+    return lazyResolver->getInheritedType(const_cast<ExtensionDecl *>(this),
+                                          index);
+  }
+
+  return getInherited()[index].getType();
+}
+
 bool ExtensionDecl::isConstrainedExtension() const {
   // Non-generic extension.
   if (!getGenericSignature())
@@ -2261,6 +2271,16 @@ void ValueDecl::copyFormalAccessFrom(const ValueDecl *source,
   }
 }
 
+Type TypeDecl::getInheritedType(unsigned index) const {
+  ASTContext &ctx = getASTContext();
+  if (auto lazyResolver = ctx.getLazyResolver()) {
+    return lazyResolver->getInheritedType(const_cast<TypeDecl *>(this),
+                                          index);
+  }
+
+  return getInherited()[index].getType();
+}
+
 Type TypeDecl::getDeclaredInterfaceType() const {
   if (auto *NTD = dyn_cast<NominalTypeDecl>(this))
     return NTD->getDeclaredInterfaceType();
@@ -3160,10 +3180,8 @@ ProtocolDecl::getInheritedProtocols() const {
   // We shouldn't need this, but it shows up in recursive invocations.
   if (!isRequirementSignatureComputed()) {
     SmallPtrSet<ProtocolDecl *, 4> known;
-    if (auto resolver = getASTContext().getLazyResolver())
-      resolver->resolveInheritanceClause(const_cast<ProtocolDecl *>(this));
-    for (auto inherited : getInherited()) {
-      if (auto type = inherited.getType()) {
+    for (unsigned index : indices(getInherited())) {
+      if (auto type = getInheritedType(index)) {
         // Only protocols can appear in the inheritance clause
         // of a protocol -- anything else should get diagnosed
         // elsewhere.
diff --git a/lib/AST/GenericSignatureBuilder.cpp b/lib/AST/GenericSignatureBuilder.cpp
@@ -4124,7 +4124,7 @@ void GenericSignatureBuilder::addGenericParameter(GenericTypeParamType *GenericP
 /// Visit all of the types that show up in the list of inherited
 /// types.
 static ConstraintResult visitInherited(
-         ArrayRef<TypeLoc> inheritedTypes,
+         llvm::PointerUnion<TypeDecl *, ExtensionDecl *> decl,
          llvm::function_ref<ConstraintResult(Type, const TypeRepr *)> visitType) {
   // Local function that (recursively) adds inherited types.
   ConstraintResult result = ConstraintResult::Resolved;
@@ -4151,8 +4151,17 @@ static ConstraintResult visitInherited(
   };
 
   // Visit all of the inherited types.
-  for (auto inherited : inheritedTypes) {
-    visitInherited(inherited.getType(), inherited.getTypeRepr());
+  auto typeDecl = decl.dyn_cast<TypeDecl *>();
+  auto extDecl = decl.dyn_cast<ExtensionDecl *>();
+  ArrayRef<TypeLoc> inheritedTypes = typeDecl ? typeDecl->getInherited()
+                                              : extDecl->getInherited();
+  for (unsigned index : indices(inheritedTypes)) {
+    Type inheritedType = typeDecl ? typeDecl->getInheritedType(index)
+                                  : extDecl->getInheritedType(index);
+    if (!inheritedType) continue;
+
+    const auto &inherited = inheritedTypes[index];
+    visitInherited(inheritedType, inherited.getTypeRepr());
   }
 
   return result;
@@ -4190,16 +4199,16 @@ ConstraintResult GenericSignatureBuilder::expandConformanceRequirement(
 
   if (!onlySameTypeConstraints) {
     // Add all of the inherited protocol requirements, recursively.
-    if (auto resolver = getLazyResolver())
-      resolver->resolveInheritedProtocols(proto);
-
     auto inheritedReqResult =
       addInheritedRequirements(proto, selfType.getUnresolvedType(), source,
                                proto->getModuleContext());
     if (isErrorResult(inheritedReqResult))
       return inheritedReqResult;
   }
 
+  if (auto resolver = getLazyResolver())
+    resolver->resolveTrailingWhereClause(proto);
+
   // Add any requirements in the where clause on the protocol.
   if (auto WhereClause = proto->getTrailingWhereClause()) {
     for (auto &req : WhereClause->getRequirements()) {
@@ -5224,10 +5233,6 @@ ConstraintResult GenericSignatureBuilder::addInheritedRequirements(
       decl->getInterfaceType()->is<ErrorType>())
     return ConstraintResult::Resolved;
 
-  // Walk the 'inherited' list to identify requirements.
-  if (auto resolver = getLazyResolver())
-    resolver->resolveInheritanceClause(decl);
-
   // Local function to get the source.
   auto getFloatingSource = [&](const TypeRepr *typeRepr, bool forInferred) {
     if (parentSource) {
@@ -5269,7 +5274,7 @@ ConstraintResult GenericSignatureBuilder::addInheritedRequirements(
         UnresolvedHandlingKind::GenerateConstraints, inferForModule);
   };
 
-  return visitInherited(decl->getInherited(), visitType);
+  return visitInherited(decl, visitType);
 }
 
 ConstraintResult GenericSignatureBuilder::addRequirement(
diff --git a/lib/ClangImporter/ImportDecl.cpp b/lib/ClangImporter/ImportDecl.cpp
@@ -5215,21 +5215,25 @@ Decl *SwiftDeclConverter::importCompatibilityTypeAlias(
   return alias;
 }
 
-static bool inheritanceListContainsProtocol(ArrayRef<TypeLoc> inherited,
-                                            const ProtocolDecl *proto) {
-  return llvm::any_of(inherited, [proto](TypeLoc type) -> bool {
-    if (!type.getType()->isExistentialType())
-      return false;
+namespace {
+  template<typename D>
+  bool inheritanceListContainsProtocol(D decl, const ProtocolDecl *proto) {
+    return llvm::any_of(range(decl->getInherited().size()),
+                        [decl, proto](unsigned index) -> bool {
+      Type type = decl->getInheritedType(index);
+      if (!type || !type->isExistentialType())
+        return false;
 
-    auto layout = type.getType()->getExistentialLayout();
-    for (auto protoTy : layout.getProtocols()) {
-      auto *protoDecl = protoTy->getDecl();
-      if (protoDecl == proto || protoDecl->inheritsFrom(proto))
-        return true;
-    }
+      auto layout = type->getExistentialLayout();
+      for (auto protoTy : layout.getProtocols()) {
+        auto *protoDecl = protoTy->getDecl();
+        if (protoDecl == proto || protoDecl->inheritsFrom(proto))
+          return true;
+      }
 
-    return false;
-  });
+      return false;
+    });
+  }
 }
 
 static bool conformsToProtocolInOriginalModule(NominalTypeDecl *nominal,
@@ -5238,9 +5242,7 @@ static bool conformsToProtocolInOriginalModule(NominalTypeDecl *nominal,
                                                LazyResolver *resolver) {
   auto &ctx = nominal->getASTContext();
 
-  if (resolver)
-    resolver->resolveInheritanceClause(nominal);
-  if (inheritanceListContainsProtocol(nominal->getInherited(), proto))
+  if (inheritanceListContainsProtocol(nominal, proto))
     return true;
 
   for (auto attr : nominal->getAttrs().getAttributes<SynthesizedProtocolAttr>())
@@ -5263,9 +5265,7 @@ static bool conformsToProtocolInOriginalModule(NominalTypeDecl *nominal,
         extensionModule != foundationModule) {
       continue;
     }
-    if (resolver)
-      resolver->resolveInheritanceClause(extension);
-    if (inheritanceListContainsProtocol(extension->getInherited(), proto))
+    if (inheritanceListContainsProtocol(extension, proto))
       return true;
   }
 
diff --git a/lib/Sema/TypeCheckDecl.cpp b/lib/Sema/TypeCheckDecl.cpp
@@ -242,6 +242,17 @@ Type TypeChecker::getRawType(EnumDecl *enumDecl) {
   return Context.evaluator(EnumRawTypeRequest(enumDecl));
 }
 
+Type TypeChecker::getInheritedType(
+                         llvm::PointerUnion<TypeDecl *, ExtensionDecl *> decl,
+                         unsigned index) {
+  return Context.evaluator(InheritedTypeRequest(decl, index));
+}
+
+void TypeChecker::resolveTrailingWhereClause(ProtocolDecl *proto) {
+  ProtocolRequirementTypeResolver resolver;
+  validateWhereClauses(proto, &resolver);
+}
+
 void TypeChecker::validateWhereClauses(ProtocolDecl *protocol,
                                        GenericTypeResolver *resolver) {
   TypeResolutionOptions options;
@@ -266,24 +277,7 @@ void TypeChecker::validateWhereClauses(ProtocolDecl *protocol,
 void TypeChecker::resolveInheritedProtocols(ProtocolDecl *protocol) {
   IterativeTypeChecker ITC(*this);
   ITC.satisfy(requestInheritedProtocols(protocol));
-
-  ProtocolRequirementTypeResolver resolver;
-  validateWhereClauses(protocol, &resolver);
-}
-
-void TypeChecker::resolveInheritanceClause(
-       llvm::PointerUnion<TypeDecl *, ExtensionDecl *> decl) {
-  IterativeTypeChecker ITC(*this);
-  unsigned numInherited;
-  if (auto ext = decl.dyn_cast<ExtensionDecl *>()) {
-    numInherited = ext->getInherited().size();
-  } else {
-    numInherited = decl.get<TypeDecl *>()->getInherited().size();
-  }
-
-  for (unsigned i = 0; i != numInherited; ++i) {
-    ITC.satisfy(requestResolveInheritedClauseEntry({ decl, i }));
-  }
+  resolveTrailingWhereClause(protocol);
 }
 
 /// check the inheritance clause of a type declaration or extension thereof.
diff --git a/lib/Sema/TypeChecker.h b/lib/Sema/TypeChecker.h
@@ -1579,11 +1579,11 @@ class TypeChecker final : public LazyResolver {
   void validateWhereClauses(ProtocolDecl *protocol,
                             GenericTypeResolver *resolver);
 
-  /// Resolve the types in the inheritance clause of the given
-  /// declaration context, which will be a nominal type declaration or
-  /// extension declaration.
-  void resolveInheritanceClause(
-         llvm::PointerUnion<TypeDecl *, ExtensionDecl *> decl) override;
+  /// Get a specific inherited type from the given declaration.
+  Type getInheritedType(llvm::PointerUnion<TypeDecl *, ExtensionDecl *> decl,
+                        unsigned index) override;
+
+  void resolveTrailingWhereClause(ProtocolDecl *proto) override;
 
   /// Check the inheritance clause of the given declaration.
   void checkInheritanceClause(Decl *decl,
diff --git a/test/Generics/protocol_requirement_signatures.swift b/test/Generics/protocol_requirement_signatures.swift
@@ -1,5 +1,5 @@
-// RUN: %target-typecheck-verify-swift -typecheck %s -verify
-// RUN: %target-typecheck-verify-swift -typecheck -debug-generic-signatures %s > %t.dump 2>&1
+// RUN: %target-typecheck-verify-swift
+// RUN: %target-typecheck-verify-swift -debug-generic-signatures > %t.dump 2>&1
 // RUN: %FileCheck %s < %t.dump
 
 // CHECK-LABEL: .P1@
diff --git a/test/decl/class/circular_inheritance.swift b/test/decl/class/circular_inheritance.swift
diff --git a/test/decl/protocol/protocols.swift b/test/decl/protocol/protocols.swift
diff --git a/validation-test/compiler_crashers_2_fixed/0054-sr833.swift b/validation-test/compiler_crashers_2_fixed/0054-sr833.swift
diff --git a/validation-test/compiler_crashers_fixed/28766-swift-iterativetypechecker-isqualifiedlookupindeclcontextsatisfied-swift-declcon.swift b/validation-test/compiler_crashers_fixed/28766-swift-iterativetypechecker-isqualifiedlookupindeclcontextsatisfied-swift-declcon.swift
diff --git a/validation-test/compiler_crashers_fixed/28865-void-lookupinmodule-llvm-smallset-swift-cantype-4u-anonymous-namespace-sortcanty.swift b/validation-test/compiler_crashers_fixed/28865-void-lookupinmodule-llvm-smallset-swift-cantype-4u-anonymous-namespace-sortcanty.swift
