Merge pull request #12107 from apple/revert-12097-gsb-nested-type-lookup

Revert "[GSB] Centralize, clean up, and cache nested type name lookup"

Author: gottesmm

include/swift/AST/GenericSignatureBuilder.h

@@ -215,15 +215,6 @@ class GenericSignatureBuilder {
     /// a superclass requirement.
     bool isConformanceSatisfiedBySuperclass(ProtocolDecl *proto) const;
 
-    /// Lookup a nested type with the given name within this equivalence
-    /// class.
-    ///
-    /// \param otherConcreteTypes If non-null, will be filled in the all of the
-    /// concrete types we found (other than the result) with the same name.
-    TypeDecl *lookupNestedType(
-                   Identifier name,
-                   SmallVectorImpl<TypeDecl *> *otherConcreteTypes = nullptr);
-
     /// Dump a debugging representation of this equivalence class.
     void dump(llvm::raw_ostream &out) const;
 
@@ -241,17 +232,6 @@ class GenericSignatureBuilder {
       /// anchor was cached.
       unsigned numMembers;
     } archetypeAnchorCache;
-
-    /// Describes a cached nested type.
-    struct CachedNestedType {
-      unsigned numConformancesPresent;
-      CanType superclassPresent;
-      llvm::TinyPtrVector<TypeDecl *> types;
-    };
-
-    /// Cached nested-type information, which contains the best declaration
-    /// for a given name.
-    llvm::SmallDenseMap<Identifier, CachedNestedType> nestedTypeNameCache;
   };
 
   friend class RequirementSource;
@@ -542,6 +522,9 @@ class GenericSignatureBuilder {
   /// \brief Add all of a generic signature's parameters and requirements.
   void addGenericSignature(GenericSignature *sig);
 
+  /// \brief Build the generic signature.
+  GenericSignature *getGenericSignature();
+
   /// Infer requirements from the given type, recursively.
   ///
   /// This routine infers requirements from a type that occurs within the
@@ -575,13 +558,11 @@ class GenericSignatureBuilder {
   /// \brief Finalize the set of requirements and compute the generic
   /// signature.
   ///
-  /// After this point, one cannot introduce new requirements, and the
-  /// generic signature builder no longer has valid state.
+  /// After this point, one cannot introduce new requirements.
   GenericSignature *computeGenericSignature(
                       SourceLoc loc,
-                      bool allowConcreteGenericParams = false) &&;
+                      bool allowConcreteGenericParams = false);
 
-private:
   /// Finalize the set of requirements, performing any remaining checking
   /// required before generating archetypes.
   ///
@@ -591,7 +572,6 @@ class GenericSignatureBuilder {
                 ArrayRef<GenericTypeParamType *> genericParams,
                 bool allowConcreteGenericParams=false);
 
-public:
   /// Process any delayed requirements that can be handled now.
   void processDelayedRequirements();
 
@@ -1510,12 +1490,6 @@ class GenericSignatureBuilder::PotentialArchetype {
     return parentOrBuilder.dyn_cast<PotentialArchetype *>();
   }
 
-  /// Retrieve the type declaration to which this nested type was resolved.
-  TypeDecl *getResolvedType() const {
-    assert(getParent() && "Not an associated type");
-    return identifier.assocTypeOrConcrete;
-  }
-
   /// Retrieve the associated type to which this potential archetype
   /// has been resolved.
   AssociatedTypeDecl *getResolvedAssociatedType() const {
@@ -1658,8 +1632,13 @@ class GenericSignatureBuilder::PotentialArchetype {
                                     ArchetypeResolutionKind kind,
                                     GenericSignatureBuilder &builder);
 
-  /// \brief Retrieve (or create) a nested type with a known type.
-  PotentialArchetype *getNestedType(TypeDecl *type,
+  /// \brief Retrieve (or create) a nested type with a known associated type.
+  PotentialArchetype *getNestedType(AssociatedTypeDecl *assocType,
+                                    GenericSignatureBuilder &builder);
+
+  /// \brief Retrieve (or create) a nested type with a known concrete type
+  /// declaration.
+  PotentialArchetype *getNestedType(TypeDecl *concreteDecl,
                                     GenericSignatureBuilder &builder);
 
   /// \brief Retrieve (or create) a nested type that is the current best
@@ -1679,8 +1658,8 @@ class GenericSignatureBuilder::PotentialArchetype {
   /// type or typealias of the given protocol, unless the \c kind implies that
   /// a potential archetype should not be created if it's missing.
   PotentialArchetype *updateNestedTypeForConformance(
-                        TypeDecl *type,
-                        ArchetypeResolutionKind kind);
+                      PointerUnion<AssociatedTypeDecl *, TypeDecl *> type,
+                      ArchetypeResolutionKind kind);
 
   /// Update the named nested type when we know this type conforms to the given
   /// protocol.

lib/AST/ASTContext.cpp

@@ -4591,7 +4591,7 @@ CanGenericSignature ASTContext::getExistentialSignature(CanType existential,
     GenericSignatureBuilder::FloatingRequirementSource::forAbstract();
   builder.addRequirement(requirement, source, nullptr);
 
-  CanGenericSignature genericSig(std::move(builder).computeGenericSignature(SourceLoc()));
+  CanGenericSignature genericSig(builder.computeGenericSignature(SourceLoc()));
 
   auto result = Impl.ExistentialSignatures.insert(
     std::make_pair(existential, genericSig));

lib/AST/Builtins.cpp

@@ -491,8 +491,7 @@ namespace {
         Builder.addGenericParameter(gp);
       }
 
-      auto GenericSig =
-        std::move(Builder).computeGenericSignature(SourceLoc());
+      auto GenericSig = Builder.computeGenericSignature(SourceLoc());
       GenericEnv = GenericSig->createGenericEnvironment(*ctx.TheBuiltinModule);
     }
 

lib/AST/Decl.cpp

@@ -3419,8 +3419,7 @@ void ProtocolDecl::computeRequirementSignature() {
          nullptr);
 
   // Compute and record the signature.
-  auto requirementSig =
-    std::move(builder).computeGenericSignature(SourceLoc());
+  auto requirementSig = builder.computeGenericSignature(SourceLoc());
   RequirementSignature = requirementSig->getRequirements().data();
   assert(RequirementSignature != nullptr);
   NumRequirementsInSignature = requirementSig->getRequirements().size();