Merge pull request swiftlang#38606 from CodaFi/fly-by-require

swift-ci · web-flow · commit af1706e7d1c6 · 2021-09-20T18:17:22.000-07:00
diff --git a/include/swift/AST/GenericSignature.h b/include/swift/AST/GenericSignature.h
@@ -201,6 +201,18 @@ class GenericSignature {
   /// signature.
   GenericEnvironment *getGenericEnvironment() const;
 
+  /// Return the requirements of this generic signature that are not also
+  /// satisfied by \c otherSig.
+  ///
+  /// \param otherSig Another generic signature whose generic parameters are
+  /// equivalent to or a subset of the generic parameters in this signature.
+  SmallVector<Requirement, 4>
+  requirementsNotSatisfiedBy(GenericSignature otherSig) const;
+
+  /// Return the canonical version of the given type under this generic
+  /// signature.
+  CanType getCanonicalTypeInContext(Type type) const;
+
   /// Check invariants.
   void verify() const;
 };
@@ -373,18 +385,6 @@ class alignas(1 << TypeAlignInBits) GenericSignatureImpl final
   bool isRequirementSatisfied(
       Requirement requirement, bool allowMissing = false) const;
 
-  /// Return the requirements of this generic signature that are not also
-  /// satisfied by \c otherSig.
-  ///
-  /// \param otherSig Another generic signature whose generic parameters are
-  /// equivalent to or a subset of the generic parameters in this signature.
-  SmallVector<Requirement, 4> requirementsNotSatisfiedBy(
-                                  GenericSignature otherSig) const;
-
-  /// Return the canonical version of the given type under this generic
-  /// signature.
-  CanType getCanonicalTypeInContext(Type type) const;
-
   bool isCanonicalTypeInContext(Type type) const;
   bool isCanonicalTypeInContext(Type type,
                                 GenericSignatureBuilder &builder) const;
@@ -462,6 +462,18 @@ class alignas(1 << TypeAlignInBits) GenericSignatureImpl final
   /// (archetypes) that correspond to the interface types in this generic
   /// signature.
   GenericEnvironment *getGenericEnvironment() const;
+
+  /// Return the requirements of this generic signature that are not also
+  /// satisfied by \c otherSig.
+  ///
+  /// \param otherSig Another generic signature whose generic parameters are
+  /// equivalent to or a subset of the generic parameters in this signature.
+  SmallVector<Requirement, 4>
+  requirementsNotSatisfiedBy(GenericSignature otherSig) const;
+
+  /// Return the canonical version of the given type under this generic
+  /// signature.
+  CanType getCanonicalTypeInContext(Type type) const;
 };
 
 void simple_display(raw_ostream &out, GenericSignature sig);
diff --git a/include/swift/SIL/AbstractionPattern.h b/include/swift/SIL/AbstractionPattern.h
@@ -530,7 +530,7 @@ class AbstractionPattern {
     OrigType = origType;
     GenericSig = CanGenericSignature();
     if (OrigType->hasTypeParameter()) {
-      assert(OrigType == signature->getCanonicalTypeInContext(origType));
+      assert(OrigType == signature.getCanonicalTypeInContext(origType));
       GenericSig = signature;
     }
   }
diff --git a/include/swift/SILOptimizer/Analysis/DifferentiableActivityAnalysis.h b/include/swift/SILOptimizer/Analysis/DifferentiableActivityAnalysis.h
@@ -135,8 +135,8 @@ class DifferentiableActivityInfo {
   bool hasTangentSpace(SILValue value) {
     auto type = value->getType().getASTType();
     // Remap archetypes in the derivative generic signature, if it exists.
-    if (derivativeGenericSignature && type->hasArchetype()) {
-      type = derivativeGenericSignature->getCanonicalTypeInContext(
+    if (type->hasArchetype()) {
+      type = derivativeGenericSignature.getCanonicalTypeInContext(
           type->mapTypeOutOfContext());
     }
     // Look up conformance in the current module.
diff --git a/lib/AST/ASTContext.cpp b/lib/AST/ASTContext.cpp
@@ -5159,9 +5159,9 @@ bool ASTContext::overrideGenericSignatureReqsSatisfied(
 
   switch (direction) {
   case OverrideGenericSignatureReqCheck::BaseReqSatisfiedByDerived:
-    return sig->requirementsNotSatisfiedBy(derivedSig).empty();
+    return sig.requirementsNotSatisfiedBy(derivedSig).empty();
   case OverrideGenericSignatureReqCheck::DerivedReqSatisfiedByBase:
-    return derivedSig->requirementsNotSatisfiedBy(sig).empty();
+    return derivedSig.requirementsNotSatisfiedBy(sig).empty();
   }
   llvm_unreachable("Unhandled OverrideGenericSignatureReqCheck in switch");
 }
diff --git a/lib/AST/ASTMangler.cpp b/lib/AST/ASTMangler.cpp
@@ -2645,7 +2645,7 @@ bool ASTMangler::appendGenericSignature(GenericSignature sig,
       genericParams = canSig.getGenericParams();
       requirements = canSig.getRequirements();
     } else {
-      requirementsBuffer = canSig->requirementsNotSatisfiedBy(contextSig);
+      requirementsBuffer = canSig.requirementsNotSatisfiedBy(contextSig);
       requirements = requirementsBuffer;
     }
   } else {
diff --git a/lib/AST/Attr.cpp b/lib/AST/Attr.cpp
@@ -991,8 +991,7 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options,
       auto genericSig = FnDecl->getGenericSignature();
 
       if (auto sig = attr->getSpecializedSignature()) {
-        requirementsScratch = sig->requirementsNotSatisfiedBy(
-            genericSig);
+        requirementsScratch = sig.requirementsNotSatisfiedBy(genericSig);
         requirements = requirementsScratch;
       }
     }
diff --git a/lib/AST/GenericSignature.cpp b/lib/AST/GenericSignature.cpp
@@ -967,6 +967,16 @@ bool GenericSignatureImpl::isRequirementSatisfied(
   return requirement.isSatisfied(conditionalRequirements, allowMissing);
 }
 
+SmallVector<Requirement, 4>
+GenericSignature::requirementsNotSatisfiedBy(GenericSignature otherSig) const {
+  // The null generic signature has no requirements, therefore all requirements
+  // are satisfied by any signature.
+  if (isNull()) {
+    return {};
+  }
+  return getPointer()->requirementsNotSatisfiedBy(otherSig);
+}
+
 SmallVector<Requirement, 4> GenericSignatureImpl::requirementsNotSatisfiedBy(
                                             GenericSignature otherSig) const {
   SmallVector<Requirement, 4> result;
@@ -1071,6 +1081,15 @@ bool GenericSignatureImpl::isCanonicalTypeInContext(
   });
 }
 
+CanType GenericSignature::getCanonicalTypeInContext(Type type) const {
+  // The null generic signature has no requirements so cannot influence the
+  // structure of the can type computed here.
+  if (isNull()) {
+    return type->getCanonicalType();
+  }
+  return getPointer()->getCanonicalTypeInContext(type);
+}
+
 CanType GenericSignatureImpl::getCanonicalTypeInContext(Type type) const {
   type = type->getCanonicalType();
 
diff --git a/lib/AST/ProtocolConformance.cpp b/lib/AST/ProtocolConformance.cpp
@@ -543,7 +543,7 @@ ConditionalRequirementsRequest::evaluate(Evaluator &evaluator,
 
   // Find the requirements in the extension that aren't proved by the original
   // type, these are the ones that make the conformance conditional.
-  const auto unsatReqs = extensionSig->requirementsNotSatisfiedBy(typeSig);
+  const auto unsatReqs = extensionSig.requirementsNotSatisfiedBy(typeSig);
   if (unsatReqs.empty())
     return {};
 
diff --git a/lib/AST/SubstitutionMap.cpp b/lib/AST/SubstitutionMap.cpp
@@ -295,7 +295,7 @@ Type SubstitutionMap::lookupSubstitution(CanSubstitutableType type) const {
 
   // The generic parameter may not be canonical. Retrieve the canonical
   // type, which will be dependent.
-  CanType canonicalType = genericSig->getCanonicalTypeInContext(genericParam);
+  CanType canonicalType = genericSig.getCanonicalTypeInContext(genericParam);
 
   // If nothing changed, we don't have a replacement.
   if (canonicalType == type) return Type();
diff --git a/lib/AST/Type.cpp b/lib/AST/Type.cpp
@@ -1450,10 +1450,7 @@ CanType TypeBase::computeCanonicalType() {
 }
 
 CanType TypeBase::getCanonicalType(GenericSignature sig) {
-  if (!sig)
-    return getCanonicalType();
-
-  return sig->getCanonicalTypeInContext(this);
+  return sig.getCanonicalTypeInContext(this);
 }
 
 TypeBase *TypeBase::reconstituteSugar(bool Recursive) {
@@ -1904,7 +1901,7 @@ class IsBindableVisitor
         
         // Collect requirements from the conformance not satisfied by the
         // original declaration.
-        for (auto reqt : conformanceSig->requirementsNotSatisfiedBy(genericSig)) {
+        for (auto reqt : conformanceSig.requirementsNotSatisfiedBy(genericSig)) {
           LLVM_DEBUG(llvm::dbgs() << "\n- adds requirement\n";
                      reqt.dump(llvm::dbgs()));
           
diff --git a/lib/SIL/IR/AbstractionPattern.cpp b/lib/SIL/IR/AbstractionPattern.cpp
@@ -47,13 +47,9 @@ TypeConverter::getAbstractionPattern(AbstractStorageDecl *decl,
 
 AbstractionPattern
 TypeConverter::getAbstractionPattern(SubscriptDecl *decl, bool isNonObjC) {
-  auto type = decl->getElementInterfaceType()->getCanonicalType();
-  CanGenericSignature genericSig;
-  if (auto sig = decl->getGenericSignatureOfContext()) {
-    genericSig = sig.getCanonicalSignature();
-    type = sig->getCanonicalTypeInContext(type);
-  }
-  return AbstractionPattern(genericSig, type);
+  auto sig = decl->getGenericSignatureOfContext().getCanonicalSignature();
+  auto type = sig.getCanonicalTypeInContext(decl->getElementInterfaceType());
+  return AbstractionPattern(sig, type);
 }
 
 static const clang::Type *getClangType(const clang::Decl *decl) {
@@ -78,30 +74,27 @@ static Bridgeability getClangDeclBridgeability(const clang::Decl *decl) {
 
 AbstractionPattern
 TypeConverter::getAbstractionPattern(VarDecl *var, bool isNonObjC) {
-  CanType swiftType = var->getInterfaceType()
-                         ->getCanonicalType();
-
-  CanGenericSignature genericSig;
-  if (auto sig = var->getDeclContext()->getGenericSignatureOfContext()) {
-    genericSig = sig.getCanonicalSignature();
-    swiftType = genericSig->getCanonicalTypeInContext(swiftType);
-  }
+  auto sig = var->getDeclContext()
+                 ->getGenericSignatureOfContext()
+                 .getCanonicalSignature();
+  auto swiftType = sig.getCanonicalTypeInContext(var->getInterfaceType());
 
   if (isNonObjC)
-    return AbstractionPattern(genericSig, swiftType);
+    return AbstractionPattern(sig, swiftType);
 
   if (auto clangDecl = var->getClangDecl()) {
     auto clangType = getClangType(clangDecl);
     auto contextType = var->getDeclContext()->mapTypeIntoContext(swiftType);
-    swiftType = getLoweredBridgedType(
-        AbstractionPattern(genericSig, swiftType, clangType),
-        contextType, getClangDeclBridgeability(clangDecl),
-        SILFunctionTypeRepresentation::CFunctionPointer,
-        TypeConverter::ForMemory)->getCanonicalType();
-    return AbstractionPattern(genericSig, swiftType, clangType);
+    swiftType =
+        getLoweredBridgedType(AbstractionPattern(sig, swiftType, clangType),
+                              contextType, getClangDeclBridgeability(clangDecl),
+                              SILFunctionTypeRepresentation::CFunctionPointer,
+                              TypeConverter::ForMemory)
+            ->getCanonicalType();
+    return AbstractionPattern(sig, swiftType, clangType);
   }
 
-  return AbstractionPattern(genericSig, swiftType);
+  return AbstractionPattern(sig, swiftType);
 }
 
 AbstractionPattern TypeConverter::getAbstractionPattern(EnumElementDecl *decl) {
@@ -113,15 +106,12 @@ AbstractionPattern TypeConverter::getAbstractionPattern(EnumElementDecl *decl) {
          "Optional.Some does not have a unique abstraction pattern because "
          "optionals are re-abstracted");
 
-  CanType type = decl->getArgumentInterfaceType()->getCanonicalType();
-
-  CanGenericSignature genericSig;
-  if (auto sig = decl->getParentEnum()->getGenericSignatureOfContext()) {
-    genericSig = sig.getCanonicalSignature();
-    type = genericSig->getCanonicalTypeInContext(type);
-  }
+  auto sig = decl->getParentEnum()
+                 ->getGenericSignatureOfContext()
+                 .getCanonicalSignature();
+  auto type = sig.getCanonicalTypeInContext(decl->getArgumentInterfaceType());
 
-  return AbstractionPattern(genericSig, type);
+  return AbstractionPattern(sig, type);
 }
 
 AbstractionPattern::EncodedForeignInfo
diff --git a/lib/SIL/IR/SILFunctionType.cpp b/lib/SIL/IR/SILFunctionType.cpp
@@ -3542,21 +3542,18 @@ TypeConverter::getConstantOverrideInfo(TypeExpansionContext context,
 
   assert(base.requiresNewVTableEntry() && "base must not be an override");
 
-  // Figure out the generic signature for the class method call. This is the
-  // signature of the derived class, with requirements transplanted from
-  // the base method. The derived method is allowed to have fewer
-  // requirements, in which case the thunk will translate the calling
-  // convention appropriately before calling the derived method.
-  bool hasGenericRequirementDifference = false;
 
   auto derivedSig = derived.getDecl()->getAsGenericContext()
                                      ->getGenericSignature();
   auto genericSig = Context.getOverrideGenericSignature(base.getDecl(),
                                                         derived.getDecl());
-  if (genericSig) {
-    hasGenericRequirementDifference =
-      !genericSig->requirementsNotSatisfiedBy(derivedSig).empty();
-  }
+  // Figure out the generic signature for the class method call. This is the
+  // signature of the derived class, with requirements transplanted from
+  // the base method. The derived method is allowed to have fewer
+  // requirements, in which case the thunk will translate the calling
+  // convention appropriately before calling the derived method.
+  bool hasGenericRequirementDifference =
+      !genericSig.requirementsNotSatisfiedBy(derivedSig).empty();
 
   auto baseInfo = getConstantInfo(context, base);
   auto derivedInfo = getConstantInfo(context, derived);
diff --git a/lib/SIL/IR/SILPrinter.cpp b/lib/SIL/IR/SILPrinter.cpp
@@ -3706,17 +3706,8 @@ void SILSpecializeAttr::print(llvm::raw_ostream &OS) const {
   if (genericEnv)
     genericSig = genericEnv->getGenericSignature();
 
-  ArrayRef<Requirement> requirements;
-  SmallVector<Requirement, 4> requirementsScratch;
-  if (auto specializedSig = getSpecializedSignature()) {
-    if (genericSig) {
-      requirementsScratch = specializedSig->requirementsNotSatisfiedBy(
-          genericSig);
-      requirements = requirementsScratch;
-    } else {
-      requirements = specializedSig.getRequirements();
-    }
-  }
+  auto requirements =
+      getSpecializedSignature().requirementsNotSatisfiedBy(genericSig);
   if (targetFunction) {
     OS << "target: \"" << targetFunction->getName() << "\", ";
   }
diff --git a/lib/SIL/IR/TypeLowering.cpp b/lib/SIL/IR/TypeLowering.cpp
@@ -3402,11 +3402,11 @@ TypeConverter::getInterfaceBoxTypeForCapture(ValueDecl *captured,
   
   // Instantiate the layout with identity substitutions.
   auto subMap = SubstitutionMap::get(
-    signature,
-    [&](SubstitutableType *type) -> Type {
-      return signature->getCanonicalTypeInContext(type);
-    },
-    MakeAbstractConformanceForGenericType());
+      signature,
+      [&](SubstitutableType *type) -> Type {
+        return signature.getCanonicalTypeInContext(type);
+      },
+      MakeAbstractConformanceForGenericType());
 
   auto boxTy = SILBoxType::get(C, layout, subMap);
 #ifndef NDEBUG
diff --git a/lib/SILOptimizer/Differentiation/JVPCloner.cpp b/lib/SILOptimizer/Differentiation/JVPCloner.cpp
@@ -352,8 +352,8 @@ class JVPCloner::Implementation final
   /// Find the tangent space of a given canonical type.
   Optional<TangentSpace> getTangentSpace(CanType type) {
     // Use witness generic signature to remap types.
-    if (auto witnessGenSig = witness->getDerivativeGenericSignature())
-      type = witnessGenSig->getCanonicalTypeInContext(type);
+    type = witness->getDerivativeGenericSignature().getCanonicalTypeInContext(
+        type);
     return type->getAutoDiffTangentSpace(
         LookUpConformanceInModule(getModule().getSwiftModule()));
   }
diff --git a/lib/SILOptimizer/Differentiation/PullbackCloner.cpp b/lib/SILOptimizer/Differentiation/PullbackCloner.cpp
@@ -211,8 +211,9 @@ class PullbackCloner::Implementation final
 
   Optional<TangentSpace> getTangentSpace(CanType type) {
     // Use witness generic signature to remap types.
-    if (auto witnessGenSig = getWitness()->getDerivativeGenericSignature())
-      type = witnessGenSig->getCanonicalTypeInContext(type);
+    type =
+        getWitness()->getDerivativeGenericSignature().getCanonicalTypeInContext(
+            type);
     return type->getAutoDiffTangentSpace(
         LookUpConformanceInModule(getModule().getSwiftModule()));
   }
diff --git a/lib/SILOptimizer/Utils/Generics.cpp b/lib/SILOptimizer/Utils/Generics.cpp
@@ -802,23 +802,14 @@ ReabstractionInfo::createSubstitutedType(SILFunction *OrigF,
   auto CanSpecializedGenericSig = SpecializedGenericSig.getCanonicalSignature();
 
   // First substitute concrete types into the existing function type.
-  CanSILFunctionType FnTy;
-  {
-    FnTy = OrigF->getLoweredFunctionType()
-                ->substGenericArgs(M, SubstMap, getResilienceExpansion())
-                ->getUnsubstitutedType(M);
-    // FIXME: Some of the added new requirements may not have been taken into
-    // account by the substGenericArgs. So, canonicalize in the context of the
-    // specialized signature.
-    if (CanSpecializedGenericSig)
-      FnTy = cast<SILFunctionType>(
-          CanSpecializedGenericSig->getCanonicalTypeInContext(FnTy));
-    else {
-      FnTy = cast<SILFunctionType>(FnTy->getCanonicalType());
-      assert(!FnTy->hasTypeParameter() && "Type parameters outside generic context?");
-    }
-  }
+  CanSILFunctionType FnTy =
+      cast<SILFunctionType>(CanSpecializedGenericSig.getCanonicalTypeInContext(
+          OrigF->getLoweredFunctionType()
+              ->substGenericArgs(M, SubstMap, getResilienceExpansion())
+              ->getUnsubstitutedType(M)));
   assert(FnTy);
+  assert((CanSpecializedGenericSig || !FnTy->hasTypeParameter()) &&
+         "Type parameters outside generic context?");
 
   // Use the new specialized generic signature.
   auto NewFnTy = SILFunctionType::get(
@@ -1439,8 +1430,7 @@ void FunctionSignaturePartialSpecializer::
     createGenericParamsForCalleeGenericParams() {
   for (auto GP : CalleeGenericSig.getGenericParams()) {
     auto CanTy = GP->getCanonicalType();
-    auto CanTyInContext =
-        CalleeGenericSig->getCanonicalTypeInContext(CanTy);
+    auto CanTyInContext = CalleeGenericSig.getCanonicalTypeInContext(CanTy);
     auto Replacement = CanTyInContext.subst(CalleeInterfaceToCallerArchetypeMap);
     LLVM_DEBUG(llvm::dbgs() << "\n\nChecking callee generic parameter:\n";
                CanTy->dump(llvm::dbgs()));
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
diff --git a/lib/Sema/TypeCheckProtocolInference.cpp b/lib/Sema/TypeCheckProtocolInference.cpp
diff --git a/lib/Sema/TypeCheckType.cpp b/lib/Sema/TypeCheckType.cpp

Original file line number	Diff line number	Diff line change
`@@ -530,7 +530,7 @@ class AbstractionPattern {`
`530`	`530`	`OrigType = origType;`
`531`	`531`	`GenericSig = CanGenericSignature();`
`532`	`532`	`if (OrigType->hasTypeParameter()) {`
`533`		`- assert(OrigType == signature->getCanonicalTypeInContext(origType));`
	`533`	`+ assert(OrigType == signature.getCanonicalTypeInContext(origType));`
`534`	`534`	`GenericSig = signature;`
`535`	`535`	`}`
`536`	`536`	`}`
Original file line number	Diff line number	Diff line change
`@@ -5159,9 +5159,9 @@ bool ASTContext::overrideGenericSignatureReqsSatisfied(`
`5159`	`5159`
`5160`	`5160`	`switch (direction) {`
`5161`	`5161`	`case OverrideGenericSignatureReqCheck::BaseReqSatisfiedByDerived:`
`5162`		`- return sig->requirementsNotSatisfiedBy(derivedSig).empty();`
	`5162`	`+ return sig.requirementsNotSatisfiedBy(derivedSig).empty();`
`5163`	`5163`	`case OverrideGenericSignatureReqCheck::DerivedReqSatisfiedByBase:`
`5164`		`- return derivedSig->requirementsNotSatisfiedBy(sig).empty();`
	`5164`	`+ return derivedSig.requirementsNotSatisfiedBy(sig).empty();`
`5165`	`5165`	`}`
`5166`	`5166`	`llvm_unreachable("Unhandled OverrideGenericSignatureReqCheck in switch");`
`5167`	`5167`	`}`
Original file line number	Diff line number	Diff line change
`@@ -2645,7 +2645,7 @@ bool ASTMangler::appendGenericSignature(GenericSignature sig,`
`2645`	`2645`	`genericParams = canSig.getGenericParams();`
`2646`	`2646`	`requirements = canSig.getRequirements();`
`2647`	`2647`	`} else {`
`2648`		`- requirementsBuffer = canSig->requirementsNotSatisfiedBy(contextSig);`
	`2648`	`+ requirementsBuffer = canSig.requirementsNotSatisfiedBy(contextSig);`
`2649`	`2649`	`requirements = requirementsBuffer;`
`2650`	`2650`	`}`
`2651`	`2651`	`} else {`
Original file line number	Diff line number	Diff line change
`@@ -991,8 +991,7 @@ bool DeclAttribute::printImpl(ASTPrinter &Printer, const PrintOptions &Options,`
`991`	`991`	`auto genericSig = FnDecl->getGenericSignature();`
`992`	`992`
`993`	`993`	`if (auto sig = attr->getSpecializedSignature()) {`
`994`		`- requirementsScratch = sig->requirementsNotSatisfiedBy(`
`995`		`- genericSig);`
	`994`	`+ requirementsScratch = sig.requirementsNotSatisfiedBy(genericSig);`
`996`	`995`	`requirements = requirementsScratch;`
`997`	`996`	`}`
`998`	`997`	`}`