---

yaml
---
r: 348505
b: refs/heads/master
c: 5b3fdba
h: refs/heads/master
i:
  348503: aac7f3c

Author: swift-ci

[refs]

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

trunk/include/swift/AST/ASTContext.h

@@ -68,7 +68,6 @@ namespace swift {
   class InFlightDiagnostic;
   class IterableDeclContext;
   class LazyContextData;
-  class LazyGenericContextData;
   class LazyIterableDeclContextData;
   class LazyMemberLoader;
   class LazyResolver;
@@ -817,15 +816,6 @@ class ASTContext final {
   LazyContextData *getOrCreateLazyContextData(const DeclContext *decl,
                                               LazyMemberLoader *lazyLoader);
 
-  /// Get the lazy function data for the given generic context.
-  ///
-  /// \param lazyLoader If non-null, the lazy loader to use when creating the
-  /// function data. The pointer must either be null or be consistent
-  /// across all calls for the same \p func.
-  LazyGenericContextData *getOrCreateLazyGenericContextData(
-                                              const GenericContext *dc,
-                                              LazyMemberLoader *lazyLoader);
-
   /// Get the lazy iterable context for the given iterable declaration context.
   ///
   /// \param lazyLoader If non-null, the lazy loader to use when creating the
@@ -876,12 +866,6 @@ class ASTContext final {
   GenericSignatureBuilder *getOrCreateGenericSignatureBuilder(
                                                      CanGenericSignature sig);
 
-  /// Retrieve or create the canonical generic environment of a canonical
-  /// generic signature builder.
-  GenericEnvironment *getOrCreateCanonicalGenericEnvironment(
-                                       GenericSignatureBuilder *builder,
-                                       GenericSignature *sig);
-
   /// Retrieve a generic signature with a single unconstrained type parameter,
   /// like `<T>`.
   CanGenericSignature getSingleGenericParameterSignature() const;

trunk/include/swift/AST/Decl.h

@@ -1482,18 +1482,11 @@ class alignas(8) _GenericContext {
   /// moves the trailing where clause into the generic parameter list.
   TrailingWhereClause *TrailingWhere = nullptr;
 
-  /// The generic signature or environment of this declaration.
-  ///
-  /// When this declaration stores only a signature, the generic
-  /// environment will be lazily loaded.
-  mutable llvm::PointerUnion<GenericSignature *, GenericEnvironment *>
-    GenericSigOrEnv;
+  /// The generic signature of this declaration.
+  GenericSignature *GenericSig = nullptr;
 };
 
 class GenericContext : private _GenericContext, public DeclContext {
-  /// Lazily populate the generic environment.
-  GenericEnvironment *getLazyGenericEnvironmentSlow() const;
-
 protected:
   GenericContext(DeclContextKind Kind, DeclContext *Parent)
     : _GenericContext(), DeclContext(Kind, Parent) { }
@@ -1542,17 +1535,8 @@ class GenericContext : private _GenericContext, public DeclContext {
   /// Retrieve the generic requirements.
   ArrayRef<Requirement> getGenericRequirements() const;
 
-  /// Set a lazy generic environment.
-  void setLazyGenericEnvironment(LazyMemberLoader *lazyLoader,
-                                 GenericSignature *genericSig,
-                                 uint64_t genericEnvData);
-
-  /// Whether this generic context has a lazily-created generic environment
-  /// that has not yet been constructed.
-  bool hasLazyGenericEnvironment() const;
-
-  /// Set the generic context of this context.
-  void setGenericEnvironment(GenericEnvironment *genericEnv);
+  /// Set the generic signature of this context.
+  void setGenericSignature(GenericSignature *genericSig);
 
   /// Retrieve the position of any where clause for this context's
   /// generic parameters.

trunk/include/swift/AST/DeclContext.h

@@ -360,10 +360,6 @@ class alignas(1 << DeclContextAlignInBits) DeclContext {
   /// of its parents.
   GenericEnvironment *getGenericEnvironmentOfContext() const;
 
-  /// Whether the context has a generic environment that will be constructed
-  /// on first access (but has not yet been constructed).
-  bool contextHasLazyGenericEnvironment() const;
-
   /// Map an interface type to a contextual type within this context.
   Type mapTypeIntoContext(Type type) const;
 

trunk/include/swift/AST/GenericEnvironment.h

@@ -59,7 +59,6 @@ class alignas(1 << DeclAlignInBits) GenericEnvironment final
         : private llvm::TrailingObjects<GenericEnvironment, Type> {
   GenericSignature *Signature = nullptr;
   GenericSignatureBuilder *Builder = nullptr;
-  DeclContext *OwningDC = nullptr;
 
   friend TrailingObjects;
 
@@ -98,18 +97,6 @@ class alignas(1 << DeclAlignInBits) GenericEnvironment final
   GenericEnvironment *getIncomplete(GenericSignature *signature,
                                     GenericSignatureBuilder *builder);
 
-  /// Set the owning declaration context for this generic environment.
-  void setOwningDeclContext(DeclContext *owningDC);
-
-  /// Retrieve the declaration context that owns this generic environment, if
-  /// there is one.
-  ///
-  /// Note that several generic environments may refer to the same declaration
-  /// context, because non-generic declarations nested within generic ones
-  /// inherit the enclosing generic environment. In such cases, the owning
-  /// context is the outermost context.
-  DeclContext *getOwningDeclContext() const { return OwningDC; }
-
   /// Add a mapping of a generic parameter to a specific type (which may be
   /// an archetype)
   void addMapping(GenericParamKey key, Type contextType);

trunk/include/swift/AST/GenericSignature.h

@@ -32,6 +32,7 @@ class GenericSignatureBuilder;
 class ProtocolConformanceRef;
 class ProtocolType;
 class SubstitutionMap;
+class GenericEnvironment;
 
 /// An access path used to find a particular protocol conformance within
 /// a generic signature.
@@ -101,6 +102,8 @@ class alignas(1 << TypeAlignInBits) GenericSignature final
   unsigned NumGenericParams;
   unsigned NumRequirements;
 
+  GenericEnvironment *GenericEnv = nullptr;
+
   // Make vanilla new/delete illegal.
   void *operator new(size_t Bytes) = delete;
   void operator delete(void *Data) = delete;
@@ -132,9 +135,6 @@ class alignas(1 << TypeAlignInBits) GenericSignature final
   static ASTContext &getASTContext(TypeArrayView<GenericTypeParamType> params,
                                    ArrayRef<Requirement> requirements);
 
-  /// Retrieve the generic signature builder for the given generic signature.
-  GenericSignatureBuilder *getGenericSignatureBuilder();
-
   void buildConformanceAccessPath(
       SmallVectorImpl<ConformanceAccessPath::Entry> &path,
       ArrayRef<Requirement> reqs,
@@ -218,10 +218,13 @@ class alignas(1 << TypeAlignInBits) GenericSignature final
   /// Canonicalize the components of a generic signature.
   CanGenericSignature getCanonicalSignature() const;
 
-  /// Create a new generic environment that provides fresh contextual types
+  /// Retrieve the generic signature builder for the given generic signature.
+  GenericSignatureBuilder *getGenericSignatureBuilder();
+
+  /// Returns the generic environment that provides fresh contextual types
   /// (archetypes) that correspond to the interface types in this generic
   /// signature.
-  GenericEnvironment *createGenericEnvironment();
+  GenericEnvironment *getGenericEnvironment();
 
   /// Uniquing for the ASTContext.
   void Profile(llvm::FoldingSetNodeID &ID) {

trunk/include/swift/AST/LazyResolver.h

@@ -85,15 +85,8 @@ class LazyContextData {
   LazyMemberLoader *loader;
 };
 
-/// Context data for generic contexts.
-class LazyGenericContextData : public LazyContextData {
-public:
-  /// The context data used for loading the generic environment.
-  uint64_t genericEnvData = 0;
-};
-
 /// Context data for iterable decl contexts.
-class LazyIterableDeclContextData : public LazyGenericContextData {
+class LazyIterableDeclContextData : public LazyContextData {
 public:
   /// The context data used for loading all of the members of the iterable
   /// context.
@@ -145,10 +138,6 @@ class alignas(void*) LazyMemberLoader {
   virtual Type loadAssociatedTypeDefault(const AssociatedTypeDecl *ATD,
                                          uint64_t contextData) = 0;
 
-  /// Returns the generic environment.
-  virtual GenericEnvironment *loadGenericEnvironment(const DeclContext *decl,
-                                                     uint64_t contextData) = 0;
-
   /// Loads the requirement signature for a protocol.
   virtual void
   loadRequirementSignature(const ProtocolDecl *proto, uint64_t contextData,

trunk/include/swift/AST/Type.h

@@ -604,10 +604,6 @@ class CanGenericSignature {
   explicit CanGenericSignature(GenericSignature *Signature);
   ArrayRef<CanTypeWrapper<GenericTypeParamType>> getGenericParams() const;
 
-  /// Retrieve the canonical generic environment associated with this
-  /// generic signature.
-  GenericEnvironment *getGenericEnvironment() const;
-
   GenericSignature *operator->() const {
     return Signature;
   }
@@ -620,7 +616,7 @@ class CanGenericSignature {
     return Signature;
   }
 
-  bool operator==(const swift::CanGenericSignature& other) {
+  bool operator==(const swift::CanGenericSignature &other) {
     return Signature == other.Signature;
   }
 };

trunk/include/swift/Basic/Statistics.def

@@ -249,12 +249,6 @@ FRONTEND_STATISTIC(Sema, NumFunctionsTypechecked)
 /// amount of work the GSB does analyzing type signatures.
 FRONTEND_STATISTIC(Sema, NumGenericSignatureBuilders)
 
-/// Number of lazy generic environments registered.
-FRONTEND_STATISTIC(Sema, NumLazyGenericEnvironments)
-
-/// Number of lazy generic environments deserialized.
-FRONTEND_STATISTIC(Sema, NumLazyGenericEnvironmentsLoaded)
-
 /// Number of lazy requirement signatures registered.
 FRONTEND_STATISTIC(Sema, NumLazyRequirementSignatures)
 

trunk/lib/AST/ASTContext.cpp

@@ -370,13 +370,6 @@ FOR_KNOWN_FOUNDATION_TYPES(CACHE_FOUNDATION_DECL)
     llvm::DenseMap<GenericSignature *, std::unique_ptr<GenericSignatureBuilder>>
       GenericSignatureBuilders;
 
-    /// Canonical generic environments for canonical generic signatures.
-    ///
-    /// The keys are the generic signature builders in
-    /// \c GenericSignatureBuilders.
-    llvm::DenseMap<GenericSignatureBuilder *, GenericEnvironment *>
-      CanonicalGenericEnvironments;
-
     /// The set of function types.
     llvm::FoldingSet<FunctionType> FunctionTypes;
 
@@ -1623,22 +1616,6 @@ GenericSignatureBuilder *ASTContext::getOrCreateGenericSignatureBuilder(
   return builder;
 }
 
-GenericEnvironment *ASTContext::getOrCreateCanonicalGenericEnvironment(
-                                              GenericSignatureBuilder *builder,
-                                              GenericSignature *sig) {
-  auto arena = getArena(sig);
-  auto &canonicalGenericEnvironments =
-      getImpl().getArena(arena).CanonicalGenericEnvironments;
-
-  auto known = canonicalGenericEnvironments.find(builder);
-  if (known != canonicalGenericEnvironments.end())
-    return known->second;
-
-  auto env = sig->createGenericEnvironment();
-  canonicalGenericEnvironments[builder] = env;
-  return env;
-}
-
 Optional<llvm::TinyPtrVector<ValueDecl *>>
 OverriddenDeclsRequest::getCachedResult() const {
   auto decl = std::get<0>(getStorage());
@@ -1993,10 +1970,10 @@ LazyContextData *ASTContext::getOrCreateLazyContextData(
   assert(lazyLoader && "Queried lazy data for non-lazy iterable context");
   if (isa<ProtocolDecl>(dc))
     entry = Allocate<LazyProtocolData>();
-  else if (isa<NominalTypeDecl>(dc) || isa<ExtensionDecl>(dc))
+  else {
+    assert(isa<NominalTypeDecl>(dc) || isa<ExtensionDecl>(dc));
     entry = Allocate<LazyIterableDeclContextData>();
-  else
-    entry = Allocate<LazyGenericContextData>();
+  }
 
   entry->loader = lazyLoader;
   return entry;
@@ -2015,13 +1992,6 @@ LazyIterableDeclContextData *ASTContext::getOrCreateLazyIterableContextData(
                                                                    lazyLoader);
 }
 
-LazyGenericContextData *ASTContext::getOrCreateLazyGenericContextData(
-                                               const GenericContext *dc,
-                                               LazyMemberLoader *lazyLoader) {
-  return (LazyGenericContextData *)getOrCreateLazyContextData(dc,
-                                                              lazyLoader);
-}
-
 bool ASTContext::hasDelayedConformanceErrors() const {
   for (const auto &entry : getImpl().DelayedConformanceDiags) {
     auto &diagnostics = entry.getSecond();
@@ -3653,7 +3623,8 @@ OpaqueTypeArchetypeType::get(OpaqueTypeDecl *Decl,
 
   // Create a generic environment and bind the opaque archetype to the
   // opaque interface type from the decl's signature.
-  auto env = signature->createGenericEnvironment();
+  auto *builder = signature->getGenericSignatureBuilder();
+  auto *env = GenericEnvironment::getIncomplete(signature, builder);
   env->addMapping(GenericParamKey(opaqueInterfaceTy), newOpaque);
   newOpaque->Environment = env;
 
@@ -3726,7 +3697,8 @@ GenericEnvironment *OpenedArchetypeType::getGenericEnvironment() const {
   // Create a generic environment to represent the opened type.
   auto signature = ctx.getExistentialSignature(Opened->getCanonicalType(),
                                                nullptr);
-  auto env = signature->createGenericEnvironment();
+  auto *builder = signature->getGenericSignatureBuilder();
+  auto *env = GenericEnvironment::getIncomplete(signature, builder);
   env->addMapping(signature->getGenericParams()[0], thisType);
   Environment = env;
 

trunk/lib/AST/ASTDumper.cpp

@@ -3519,10 +3519,6 @@ namespace {
       printArchetypeCommon(T, "primary_archetype_type", label);
       printField("name", T->getFullName());
       OS << "\n";
-      auto genericEnv = T->getGenericEnvironment();
-      if (auto owningDC = genericEnv->getOwningDeclContext()) {
-        owningDC->printContext(OS, Indent + 2);
-      }
       printArchetypeNestedTypes(T);
       PrintWithColorRAII(OS, ParenthesisColor) << ')';
     }