[NFC] Lift getGenericEnvironment() into GenericSignature

Author: CodaFi

include/swift/AST/GenericSignature.h

@@ -198,6 +198,11 @@ class GenericSignature {
 
   /// Whether this generic signature involves a type variable.
   bool hasTypeVariable() const;
+
+  /// Returns the generic environment that provides fresh contextual types
+  /// (archetypes) that correspond to the interface types in this generic
+  /// signature.
+  GenericEnvironment *getGenericEnvironment() const;
 };
 
 /// A reference to a canonical generic signature.
@@ -317,11 +322,6 @@ class alignas(1 << TypeAlignInBits) GenericSignatureImpl final
   /// Retrieve the requirement machine for the given generic signature.
   RequirementMachine *getRequirementMachine() const;
 
-  /// Returns the generic environment that provides fresh contextual types
-  /// (archetypes) that correspond to the interface types in this generic
-  /// signature.
-  GenericEnvironment *getGenericEnvironment() const;
-
   /// Collects a set of requirements on a type parameter. Used by
   /// GenericEnvironment for building archetypes.
   GenericSignature::LocalRequirements getLocalRequirements(Type depType) const;
@@ -456,6 +456,11 @@ class alignas(1 << TypeAlignInBits) GenericSignatureImpl final
 
   /// Returns the canonical generic signature. The result is cached.
   CanGenericSignature getCanonicalSignature() const;
+
+  /// Returns the generic environment that provides fresh contextual types
+  /// (archetypes) that correspond to the interface types in this generic
+  /// signature.
+  GenericEnvironment *getGenericEnvironment() const;
 };
 
 void simple_display(raw_ostream &out, GenericSignature sig);

lib/AST/ASTContext.cpp

@@ -1894,7 +1894,7 @@ GenericSignatureBuilder *ASTContext::getOrCreateGenericSignatureBuilder(
 
 RequirementMachine *ASTContext::getOrCreateRequirementMachine(
     CanGenericSignature sig) {
-  assert(!sig->hasTypeVariable());
+  assert(!sig.hasTypeVariable());
 
   auto &rewriteCtx = getImpl().TheRewriteContext;
   if (!rewriteCtx)

lib/AST/Attr.cpp

@@ -1800,7 +1800,7 @@ void DifferentiableAttr::setParameterIndices(IndexSubset *paramIndices) {
 GenericEnvironment *DifferentiableAttr::getDerivativeGenericEnvironment(
     AbstractFunctionDecl *original) const {
   if (auto derivativeGenSig = getDerivativeGenericSignature())
-    return derivativeGenSig->getGenericEnvironment();
+    return derivativeGenSig.getGenericEnvironment();
   return original->getGenericEnvironment();
 }
 

lib/AST/Decl.cpp

@@ -1001,10 +1001,7 @@ GenericSignature GenericContext::getGenericSignature() const {
 }
 
 GenericEnvironment *GenericContext::getGenericEnvironment() const {
-  if (auto genericSig = getGenericSignature())
-    return genericSig->getGenericEnvironment();
-
-  return nullptr;
+  return getGenericSignature().getGenericEnvironment();
 }
 
 void GenericContext::setGenericSignature(GenericSignature genericSig) {

lib/AST/GenericSignature.cpp

@@ -269,6 +269,12 @@ CanGenericSignature GenericSignatureImpl::getCanonicalSignature() const {
       CanonicalSignatureOrASTContext.get<const GenericSignatureImpl *>());
 }
 
+GenericEnvironment *GenericSignature::getGenericEnvironment() const {
+  if (isNull())
+    return nullptr;
+  return getPointer()->getGenericEnvironment();
+}
+
 GenericEnvironment *GenericSignatureImpl::getGenericEnvironment() const {
   if (GenericEnv == nullptr) {
     const auto impl = const_cast<GenericSignatureImpl *>(this);

lib/AST/RequirementEnvironment.cpp

@@ -138,12 +138,9 @@ RequirementEnvironment::RequirementEnvironment(
   if (!covariantSelf &&
       reqSig.getGenericParams().size() == 1 &&
       reqSig.getRequirements().size() == 1) {
-    syntheticSignature = conformanceDC->getGenericSignatureOfContext();
-    if (syntheticSignature) {
-      syntheticSignature = syntheticSignature.getCanonicalSignature();
-      syntheticEnvironment =
-        syntheticSignature->getGenericEnvironment();
-    }
+    syntheticSignature = conformanceDC->getGenericSignatureOfContext().getCanonicalSignature();
+    syntheticEnvironment =
+      syntheticSignature.getGenericEnvironment();
 
     return;
   }
@@ -217,5 +214,5 @@ RequirementEnvironment::RequirementEnvironment(
       AbstractGenericSignatureRequest{
         nullptr, std::move(genericParamTypes), std::move(requirements)},
       GenericSignature());
-  syntheticEnvironment = syntheticSignature->getGenericEnvironment();
+  syntheticEnvironment = syntheticSignature.getGenericEnvironment();
 }

lib/AST/RequirementMachine/GenericSignatureQueries.cpp

@@ -483,7 +483,7 @@ RequirementMachine::getConformanceAccessPath(Type type,
   // visit all of the root conformance requirements in our generic signature and
   // add them to the buffer.
   if (Impl->ConformanceAccessPaths.empty()) {
-    for (const auto &req : Impl->Sig->getRequirements()) {
+    for (const auto &req : Impl->Sig.getRequirements()) {
       // We only care about conformance requirements.
       if (req.getKind() != RequirementKind::Conformance)
         continue;
@@ -680,4 +680,4 @@ RequirementMachine::lookupNestedType(Type depType, Identifier name) const {
   }
 
   return nullptr;
-}
+}

lib/AST/RequirementMachine/RequirementMachine.cpp

@@ -86,7 +86,7 @@ RewriteSystemBuilder::getConcreteSubstitutionSchema(CanType concreteType,
 void RewriteSystemBuilder::addGenericSignature(CanGenericSignature sig) {
   // Collect all protocols transitively referenced from the generic signature's
   // requirements.
-  Protocols.visitRequirements(sig->getRequirements());
+  Protocols.visitRequirements(sig.getRequirements());
   Protocols.compute();
 
   // Add rewrite rules for each protocol.
@@ -112,7 +112,7 @@ void RewriteSystemBuilder::addGenericSignature(CanGenericSignature sig) {
   }
 
   // Add rewrite rules for all requirements in the top-level signature.
-  for (const auto &req : sig->getRequirements())
+  for (const auto &req : sig.getRequirements())
     addRequirement(req, /*proto=*/nullptr);
 }
 

lib/IRGen/GenKeyPath.cpp

@@ -1185,12 +1185,9 @@ IRGenModule::getAddrOfKeyPathPattern(KeyPathPattern *pattern,
   // Collect the required parameters for the keypath's generic environment.
   SmallVector<GenericRequirement, 4> requirements;
 
-  GenericEnvironment *genericEnv = nullptr;
-  if (auto sig = pattern->getGenericSignature()) {
-    genericEnv = sig->getGenericEnvironment();
-    enumerateGenericSignatureRequirements(pattern->getGenericSignature(),
-      [&](GenericRequirement reqt) { requirements.push_back(reqt); });
-  }
+  auto *genericEnv = pattern->getGenericSignature().getGenericEnvironment();
+  enumerateGenericSignatureRequirements(pattern->getGenericSignature(),
+    [&](GenericRequirement reqt) { requirements.push_back(reqt); });
 
   // Start building the key path pattern.
   ConstantInitBuilder builder(*this);

lib/IRGen/GenPointerAuth.cpp

@@ -523,18 +523,15 @@ static uint64_t getTypeHash(IRGenModule &IGM, CanSILFunctionType type) {
   auto genericSig = type->getInvocationGenericSignature();
   hashStringForFunctionType(
       IGM, type, Out,
-      genericSig ? genericSig.getCanonicalSignature()->getGenericEnvironment()
-                 : nullptr);
+      genericSig.getCanonicalSignature().getGenericEnvironment());
   return clang::CodeGen::computeStableStringHash(Out.str());
 }
 
 static uint64_t getYieldTypesHash(IRGenModule &IGM, CanSILFunctionType type) {
   SmallString<32> buffer;
   llvm::raw_svector_ostream out(buffer);
   auto genericSig = type->getInvocationGenericSignature();
-  GenericEnvironment *genericEnv =
-      genericSig ? genericSig.getCanonicalSignature()->getGenericEnvironment()
-                 : nullptr;
+  auto *genericEnv =  genericSig.getCanonicalSignature().getGenericEnvironment();
 
   out << [&]() -> StringRef {
     switch (type->getCoroutineKind()) {