---

yaml
---
r: 343614
b: refs/heads/master-rebranch
c: 2656220
h: refs/heads/master

Author: slavapestov

[refs]

@@ -1455,7 +1455,7 @@ refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-02-a: ddd2b2976aa9bfde5f20fe37f6bd2
 refs/tags/swift-DEVELOPMENT-SNAPSHOT-2019-08-03-a: 171cc166f2abeb5ca2a4003700a8a78a108bd300
 refs/heads/benlangmuir-patch-1: baaebaf39d52f3bf36710d4fe40cf212e996b212
 refs/heads/i-do-redeclare: 8c4e6d5de5c1e3f0a2cedccf319df713ea22c48e
-refs/heads/master-rebranch: 600a6f37d86c125aad40d010a53e803691a5afbb
+refs/heads/master-rebranch: 26562202220fd1b0c86b9aee53d1b634bd5df860
 refs/heads/rdar-53901732: 9bd06af3284e18a109cdbf9aa59d833b24eeca7b
 refs/heads/revert-26776-subst-always-returns-a-type: 1b8e18fdd391903a348970a4c848995d4cdd789c
 refs/heads/tensorflow-merge: 8b854f62f80d4476cb383d43c4aac2001dde3cec

branches/master-rebranch/lib/Serialization/Deserialization.cpp

@@ -808,24 +808,10 @@ static void skipGenericRequirements(llvm::BitstreamCursor &Cursor) {
 }
 
 void ModuleFile::configureGenericEnvironment(
-    GenericContext *genericDecl, serialization::GenericSignatureID envID) {
-  if (envID == 0) return;
-
-  auto sigOrEnv = getGenericSignatureOrEnvironment(envID);
-
-  // If we just have a generic signature, set up lazy generic environment
-  // creation.
-  if (auto genericSig = sigOrEnv.dyn_cast<GenericSignature *>()) {
-    genericDecl->setLazyGenericEnvironment(this, genericSig, envID);
-    return;
-  }
-
-  // If we have a full generic environment, it's because it happened to be
-  // deserialized already. Record it directly.
-  if (auto genericEnv = sigOrEnv.dyn_cast<GenericEnvironment *>()) {
-    genericDecl->setGenericEnvironment(genericEnv);
-    return;
-  }
+    GenericContext *genericDecl, serialization::GenericSignatureID sigID) {
+  if (sigID == 0) return;
+  auto *genericSig = getGenericSignature(sigID);
+  genericDecl->setLazyGenericEnvironment(this, genericSig, sigID);
 }
 
 GenericSignature *ModuleFile::getGenericSignature(
@@ -835,20 +821,17 @@ GenericSignature *ModuleFile::getGenericSignature(
   // Zero is a sentinel for having no generic signature.
   if (ID == 0) return nullptr;
 
-  assert(ID <= GenericSignaturesAndEnvironments.size() &&
+  assert(ID <= GenericSignatures.size() &&
          "invalid GenericSignature ID");
-  auto &sigOrEnvOrOffset = GenericSignaturesAndEnvironments[ID-1];
+  auto &sigOffset = GenericSignatures[ID-1];
 
   // If we've already deserialized this generic signature, return it.
-  if (sigOrEnvOrOffset.isComplete()) {
-    if (auto *env = sigOrEnvOrOffset.get().dyn_cast<GenericEnvironment *>())
-      return env->getGenericSignature();
-    return sigOrEnvOrOffset.get().get<GenericSignature *>();
-  }
+  if (sigOffset.isComplete())
+    return sigOffset.get();
 
   // Read the generic signature.
   BCOffsetRAII restoreOffset(DeclTypeCursor);
-  DeclTypeCursor.JumpToBit(sigOrEnvOrOffset);
+  DeclTypeCursor.JumpToBit(sigOffset);
 
   // Read the parameter types.
   SmallVector<GenericTypeParamType *, 4> paramTypes;
@@ -909,51 +892,16 @@ GenericSignature *ModuleFile::getGenericSignature(
   // If we've already deserialized this generic signature, start over to return
   // it directly.
   // FIXME: Is this kind of re-entrancy actually possible?
-  if (sigOrEnvOrOffset.isComplete())
+  if (sigOffset.isComplete())
     return getGenericSignature(ID);
 
   // Construct the generic signature from the loaded parameters and
   // requirements.
   auto signature = GenericSignature::get(paramTypes, requirements);
-  sigOrEnvOrOffset = signature;
+  sigOffset = signature;
   return signature;
 }
 
-ModuleFile::GenericSignatureOrEnvironment
-ModuleFile::getGenericSignatureOrEnvironment(
-    serialization::GenericSignatureID ID,
-    bool wantEnvironment) {
-  // The empty result with the type the caller expects.
-  GenericSignatureOrEnvironment result;
-  if (wantEnvironment)
-    result = static_cast<GenericEnvironment *>(nullptr);
-
-  // Zero is a sentinel for having no generic environment.
-  if (ID == 0) return result;
-
-  assert(ID <= GenericSignaturesAndEnvironments.size() &&
-         "invalid GenericEnvironment ID");
-  auto &sigOrEnvOrOffset = GenericSignaturesAndEnvironments[ID-1];
-
-  if (!sigOrEnvOrOffset.isComplete()) {
-    // Force the loading process by fetching the generic signature.
-    (void)getGenericSignature(ID);
-    assert(sigOrEnvOrOffset.isComplete());
-  }
-
-  if (wantEnvironment)
-    if (auto *sig = sigOrEnvOrOffset.get().dyn_cast<GenericSignature *>())
-      sigOrEnvOrOffset.uncheckedOverwrite(sig->getGenericEnvironment());
-
-  return sigOrEnvOrOffset.get();
-}
-
-GenericEnvironment *
-ModuleFile::getGenericEnvironment(serialization::GenericSignatureID ID) {
-  return getGenericSignatureOrEnvironment(ID, /*wantEnvironment=*/true)
-           .get<GenericEnvironment *>();
-}
-
 SubstitutionMap ModuleFile::getSubstitutionMap(
                                         serialization::SubstitutionMapID id) {
   using namespace decls_block;
@@ -3040,16 +2988,16 @@ class swift::DeclDeserializer {
     DeclContextID contextID;
     GenericSignatureID interfaceSigID;
     TypeID interfaceTypeID;
-    GenericSignatureID genericEnvID;
+    GenericSignatureID genericSigID;
     SubstitutionMapID underlyingTypeID;
 
     decls_block::OpaqueTypeLayout::readRecord(scratch, contextID,
                                               namingDeclID, interfaceSigID,
-                                              interfaceTypeID, genericEnvID,
+                                              interfaceTypeID, genericSigID,
                                               underlyingTypeID);
 
     auto declContext = MF.getDeclContext(contextID);
-    auto sig = MF.getGenericSignature(interfaceSigID);
+    auto interfaceSig = MF.getGenericSignature(interfaceSigID);
     auto interfaceType = MF.getType(interfaceTypeID)
                             ->castTo<GenericTypeParamType>();
 
@@ -3060,7 +3008,7 @@ class swift::DeclDeserializer {
     // Create the decl.
     auto opaqueDecl =
       new (ctx) OpaqueTypeDecl(nullptr, nullptr, declContext,
-                               sig, interfaceType);
+                               interfaceSig, interfaceType);
     declOrOffset = opaqueDecl;
 
     auto namingDecl = cast<ValueDecl>(MF.getDecl(namingDeclID));
@@ -3069,14 +3017,15 @@ class swift::DeclDeserializer {
     if (auto genericParams = MF.maybeReadGenericParams(opaqueDecl))
       opaqueDecl->setGenericParams(genericParams);
 
-    auto genericEnv = MF.getGenericEnvironment(genericEnvID);
-    opaqueDecl->setGenericEnvironment(genericEnv);
+    auto genericSig = MF.getGenericSignature(genericSigID);
+    if (genericSig)
+      opaqueDecl->setGenericEnvironment(genericSig->getGenericEnvironment());
     if (underlyingTypeID)
       opaqueDecl->setUnderlyingTypeSubstitutions(
                                        MF.getSubstitutionMap(underlyingTypeID));
     SubstitutionMap subs;
-    if (genericEnv) {
-      subs = genericEnv->getGenericSignature()->getIdentitySubstitutionMap();
+    if (genericSig) {
+      subs = genericSig->getIdentitySubstitutionMap();
     }
     auto opaqueTy = OpaqueTypeArchetypeType::get(opaqueDecl, subs);
     auto metatype = MetatypeType::get(opaqueTy);
@@ -4727,18 +4676,19 @@ class swift::TypeDeserializer {
 
   Expected<Type> deserializePrimaryArchetypeType(ArrayRef<uint64_t> scratch,
                                                  StringRef blobData) {
-    GenericSignatureID envID;
+    GenericSignatureID sigID;
     unsigned depth, index;
 
-    decls_block::PrimaryArchetypeTypeLayout::readRecord(scratch, envID,
+    decls_block::PrimaryArchetypeTypeLayout::readRecord(scratch, sigID,
                                                         depth, index);
 
-    auto env = MF.getGenericEnvironment(envID);
-    if (!env)
+    auto sig = MF.getGenericSignature(sigID);
+    if (!sig)
       MF.fatal();
 
     Type interfaceType = GenericTypeParamType::get(depth, index, ctx);
-    Type contextType = env->mapTypeIntoContext(interfaceType);
+    Type contextType = sig->getGenericEnvironment()
+        ->mapTypeIntoContext(interfaceType);
 
     if (contextType->hasError())
       MF.fatal();
@@ -4777,18 +4727,7 @@ class swift::TypeDeserializer {
 
     auto rootTy = MF.getType(rootID)->castTo<ArchetypeType>();
     auto interfaceTy = MF.getType(interfaceTyID)->castTo<DependentMemberType>();
-    auto rootInterfaceTy = interfaceTy->getRootGenericParam();
-    
-    auto sig = rootTy->getGenericEnvironment()->getGenericSignature();
-    
-    auto subs = SubstitutionMap::get(sig,
-      [&](SubstitutableType *t) -> Type {
-        if (t->isEqual(rootInterfaceTy))
-          return rootTy;
-        return t;
-      }, LookUpConformanceInModule(MF.getAssociatedModule()));
-    
-    return Type(interfaceTy).subst(subs);
+    return rootTy->getGenericEnvironment()->mapTypeIntoContext(interfaceTy);
   }
 
   Expected<Type> deserializeGenericTypeParamType(ArrayRef<uint64_t> scratch,
@@ -5561,7 +5500,7 @@ void ModuleFile::finishNormalConformance(NormalProtocolConformance *conformance,
 
 GenericEnvironment *ModuleFile::loadGenericEnvironment(const DeclContext *decl,
                                                        uint64_t contextData) {
-  return getGenericEnvironment(contextData);
+  return decl->getGenericSignatureOfContext()->getGenericEnvironment();
 }
 
 void ModuleFile::loadRequirementSignature(const ProtocolDecl *decl,

branches/master-rebranch/lib/Serialization/DeserializeSIL.cpp

@@ -465,7 +465,7 @@ SILDeserializer::readSILFunctionChecked(DeclID FID, SILFunction *existingFn,
   DeclID clangNodeOwnerID;
   TypeID funcTyID;
   IdentifierID replacedFunctionID;
-  GenericSignatureID genericEnvID;
+  GenericSignatureID genericSigID;
   unsigned rawLinkage, isTransparent, isSerialized, isThunk,
       isWithoutactuallyEscapingThunk, isGlobal, inlineStrategy,
       optimizationMode, effect, numSpecAttrs, hasQualifiedOwnership,
@@ -476,7 +476,7 @@ SILDeserializer::readSILFunctionChecked(DeclID FID, SILFunction *existingFn,
       isWithoutactuallyEscapingThunk, isGlobal, inlineStrategy,
       optimizationMode, effect, numSpecAttrs, hasQualifiedOwnership,
       isWeakLinked, isDynamic, isExactSelfClass,
-      funcTyID, replacedFunctionID, genericEnvID,
+      funcTyID, replacedFunctionID, genericSigID,
       clangNodeOwnerID, SemanticsIDs);
 
   if (funcTyID == 0) {
@@ -643,7 +643,8 @@ SILDeserializer::readSILFunctionChecked(DeclID FID, SILFunction *existingFn,
 
   GenericEnvironment *genericEnv = nullptr;
   if (!declarationOnly)
-    genericEnv = MF->getGenericEnvironment(genericEnvID);
+    if (auto *genericSig = MF->getGenericSignature(genericSigID))
+      genericEnv = genericSig->getGenericEnvironment();
 
   // If the next entry is the end of the block, then this function has
   // no contents.
@@ -2534,7 +2535,7 @@ bool SILDeserializer::hasSILFunction(StringRef Name,
   DeclID clangOwnerID;
   TypeID funcTyID;
   IdentifierID replacedFunctionID;
-  GenericSignatureID genericEnvID;
+  GenericSignatureID genericSigID;
   unsigned rawLinkage, isTransparent, isSerialized, isThunk,
       isWithoutactuallyEscapingThunk, isGlobal, inlineStrategy,
       optimizationMode, effect, numSpecAttrs, hasQualifiedOwnership,
@@ -2545,7 +2546,7 @@ bool SILDeserializer::hasSILFunction(StringRef Name,
       isWithoutactuallyEscapingThunk, isGlobal, inlineStrategy,
       optimizationMode, effect, numSpecAttrs, hasQualifiedOwnership,
       isWeakLinked, isDynamic, isExactSelfClass,
-      funcTyID, replacedFunctionID, genericEnvID,
+      funcTyID, replacedFunctionID, genericSigID,
       clangOwnerID, SemanticsIDs);
   auto linkage = fromStableSILLinkage(rawLinkage);
   if (!linkage) {

branches/master-rebranch/lib/Serialization/ModuleFile.cpp

@@ -922,7 +922,7 @@ bool ModuleFile::readIndexBlock(llvm::BitstreamCursor &cursor) {
         break;
       case index_block::GENERIC_SIGNATURE_OFFSETS:
         assert(blobData.empty());
-        allocateBuffer(GenericSignaturesAndEnvironments, scratch);
+        allocateBuffer(GenericSignatures, scratch);
         break;
       case index_block::SUBSTITUTION_MAP_OFFSETS:
         assert(blobData.empty());
@@ -2344,7 +2344,7 @@ bool SerializedASTFile::hasEntryPoint() const {
 bool SerializedASTFile::getAllGenericSignatures(
                        SmallVectorImpl<GenericSignature*> &genericSignatures) {
   genericSignatures.clear();
-  for (unsigned index : indices(File.GenericSignaturesAndEnvironments)) {
+  for (unsigned index : indices(File.GenericSignatures)) {
     if (auto genericSig = File.getGenericSignature(index + 1))
       genericSignatures.push_back(genericSig);
   }

branches/master-rebranch/lib/Serialization/ModuleFile.h

@@ -316,17 +316,8 @@ class ModuleFile
   /// Types referenced by this module.
   MutableArrayRef<Serialized<Type>> Types;
 
-  using GenericSignatureOrEnvironment =
-      llvm::PointerUnion<GenericSignature *, GenericEnvironment *>;
-
-  /// Generic signatures and environments referenced by this module.
-  ///
-  /// Technically only the GenericSignatures are encoded, but storing the
-  /// environment here too allows caching them.
-  // FIXME: That caching should be done at the AST level; it's not specific to
-  // Serialization.
-  MutableArrayRef<Serialized<GenericSignatureOrEnvironment>>
-      GenericSignaturesAndEnvironments;
+  /// Generic signatures referenced by this module.
+  MutableArrayRef<Serialized<GenericSignature *>> GenericSignatures;
 
   /// Substitution maps referenced by this module.
   MutableArrayRef<Serialized<SubstitutionMap>> SubstitutionMaps;
@@ -877,21 +868,6 @@ class ModuleFile
   /// Returns the generic signature for the given ID.
   GenericSignature *getGenericSignature(serialization::GenericSignatureID ID);
 
-  /// Returns the generic signature or environment for the given ID,
-  /// deserializing it if needed.
-  ///
-  /// \param wantEnvironment If true, always return the full generic
-  /// environment. Otherwise, only return the generic environment if it's
-  /// already been constructed, and the signature in other cases.
-  GenericSignatureOrEnvironment
-  getGenericSignatureOrEnvironment(serialization::GenericSignatureID ID,
-                                   bool wantEnvironment = false);
-
-  /// Returns the generic environment for the given ID, deserializing it if
-  /// needed.
-  GenericEnvironment *
-  getGenericEnvironment(serialization::GenericSignatureID ID);
-
   /// Returns the substitution map for the given ID, deserializing it if
   /// needed.
   SubstitutionMap getSubstitutionMap(serialization::SubstitutionMapID id);