Merge pull request swiftlang#23109 from davezarzycki/revert_gsb_opt

Revert gsb opt

Author: davezarzycki

include/swift/AST/GenericSignatureBuilder.h

@@ -935,11 +935,6 @@ class GenericSignatureBuilder::RequirementSource final
     AssociatedTypeDecl,
   };
 
-  /// Cache DependentMemberType results instead of calling
-  /// DependentMemberType::get(). The much smaller hash table is more
-  /// processor cache efficient.
-  mutable llvm::DenseMap<Type, Type> ReplacedSelfCache;
-
   /// The kind of storage we have.
   const StorageKind storageKind;
 
@@ -959,9 +954,8 @@ class GenericSignatureBuilder::RequirementSource final
     /// A protocol conformance used to satisfy the requirement.
     void *conformance;
 
-    /// A precomputed dependent member of an associated type to which a
-    /// requirement is being applied.
-    DependentMemberType *dependentMember;
+    /// An associated type to which a requirement is being applied.
+    AssociatedTypeDecl *assocType;
   } storage;
 
   friend TrailingObjects;
@@ -1099,8 +1093,7 @@ class GenericSignatureBuilder::RequirementSource final
     assert(isAcceptableStorageKind(kind, storageKind) &&
            "RequirementSource kind/storageKind mismatch");
 
-    auto ty = assocType->getDeclaredInterfaceType();
-    storage.dependentMember = cast<DependentMemberType>(ty.getPointer());
+    storage.assocType = assocType;
   }
 
   RequirementSource(Kind kind, const RequirementSource *parent)
@@ -1322,18 +1315,11 @@ class GenericSignatureBuilder::RequirementSource final
     return ProtocolConformanceRef::getFromOpaqueValue(storage.conformance);
   }
 
-  /// Retrieve the precomputed dependent member for the associated type
-  /// declaration for this requirement, if there is one.
-  DependentMemberType *getDependentMember() const {
-    if (storageKind != StorageKind::AssociatedTypeDecl) return nullptr;
-    return storage.dependentMember;
-  }
-
   /// Retrieve the associated type declaration for this requirement, if there
   /// is one.
   AssociatedTypeDecl *getAssociatedType() const {
     if (storageKind != StorageKind::AssociatedTypeDecl) return nullptr;
-    return storage.dependentMember->getAssocType();
+    return storage.assocType;
   }
 
   /// Profiling support for \c FoldingSet.
@@ -1572,11 +1558,6 @@ class GenericSignatureBuilder::PotentialArchetype {
   /// that share a name.
   llvm::MapVector<Identifier, StoredNestedType> NestedTypes;
 
-  /// Cache DependentMemberType results instead of calling
-  /// DependentMemberType::get(). The much smaller hash table is more
-  /// processor cache efficient.
-  mutable llvm::DenseMap<Type, DependentMemberType*> CachedDMTs;
-
   /// Construct a new potential archetype for a concrete declaration.
   PotentialArchetype(PotentialArchetype *parent, AssociatedTypeDecl *assocType)
       : parentOrContext(parent), identifier(assocType) {
@@ -1616,14 +1597,6 @@ class GenericSignatureBuilder::PotentialArchetype {
     return identifier.assocType;
   }
 
-  /// Retrieve the type declaration to which this nested type was resolved.
-  DependentMemberType *getResolvedDependentMemberType(Type Parent) const {
-    auto *&known = CachedDMTs[Parent];
-    if (!known)
-      known = DependentMemberType::get(Parent, getResolvedType());
-    return known;
-  }
-
   /// Determine whether this is a generic parameter.
   bool isGenericParam() const {
     return parentOrContext.is<ASTContext *>();

lib/AST/GenericSignatureBuilder.cpp

@@ -818,7 +818,7 @@ const void *RequirementSource::getOpaqueStorage1() const {
     return storage.type;
 
   case StorageKind::AssociatedTypeDecl:
-    return storage.dependentMember;
+    return storage.assocType;
   }
 
   llvm_unreachable("Unhandled StorageKind in switch.");
@@ -918,16 +918,11 @@ bool RequirementSource::isSelfDerivedSource(GenericSignatureBuilder &builder,
 /// the nested type. This limited operation makes sure that it does not
 /// create any new potential archetypes along the way, so it should only be
 /// used in cases where we're reconstructing something that we know exists.
-static Type replaceSelfWithType(llvm::DenseMap<Type, Type> &cache,
-                                Type selfType, Type depTy) {
+static Type replaceSelfWithType(Type selfType, Type depTy) {
   if (auto depMemTy = depTy->getAs<DependentMemberType>()) {
-    Type baseType = replaceSelfWithType(cache, selfType, depMemTy->getBase());
+    Type baseType = replaceSelfWithType(selfType, depMemTy->getBase());
     assert(depMemTy->getAssocType() && "Missing associated type");
-    auto &known = cache[baseType];
-    if (!known) {
-      known = DependentMemberType::get(baseType, depMemTy->getAssocType());
-    }
-    return known;
+    return DependentMemberType::get(baseType, depMemTy->getAssocType());
   }
 
   assert(depTy->is<GenericTypeParamType>() && "missing Self?");
@@ -1371,8 +1366,8 @@ RequirementSource::visitPotentialArchetypesAlongPath(
 
     if (visitor(parentType, this)) return nullptr;
 
-    return replaceSelfWithType(ReplacedSelfCache,
-                               parentType, getDependentMember());
+    return replaceSelfWithType(parentType,
+                               getAssociatedType()->getDeclaredInterfaceType());
   }
 
   case RequirementSource::NestedTypeNameMatch:
@@ -1407,8 +1402,7 @@ RequirementSource::visitPotentialArchetypesAlongPath(
 
     if (visitor(parentType, this)) return nullptr;
 
-    return replaceSelfWithType(ReplacedSelfCache,
-                               parentType, getStoredType());
+    return replaceSelfWithType(parentType, getStoredType());
   }
   }
   llvm_unreachable("unhandled kind");
@@ -1442,7 +1436,7 @@ ProtocolDecl *RequirementSource::getProtocolDecl() const {
     return getProtocolConformance().getRequirement();
 
   case StorageKind::AssociatedTypeDecl:
-    return storage.dependentMember->getAssocType()->getProtocol();
+    return storage.assocType->getProtocol();
   }
 
   llvm_unreachable("Unhandled StorageKind in switch.");
@@ -1613,9 +1607,8 @@ void RequirementSource::print(llvm::raw_ostream &out,
   }
 
   case StorageKind::AssociatedTypeDecl:
-    auto assocType = storage.dependentMember->getAssocType();
-    out << " (" << assocType->getProtocol()->getName()
-        << "::" << assocType->getName() << ")";
+    out << " (" << storage.assocType->getProtocol()->getName()
+        << "::" << storage.assocType->getName() << ")";
     break;
   }
 
@@ -2940,7 +2933,7 @@ Type GenericSignatureBuilder::PotentialArchetype::getDependentType(
     if (parentType->hasError())
       return parentType;
 
-    return getResolvedDependentMemberType(parentType);
+    return DependentMemberType::get(parentType, getResolvedType());
   }
 
   assert(isGenericParam() && "Not a generic parameter?");