Merge pull request swiftlang#68220 from slavapestov/remove-get-protocol-self-type

slavapestov · web-flow · commit d2f1dedd35a0 · 2023-08-31T11:39:17.000-04:00
Remove DeclContext::getSelfProtocolType()
diff --git a/include/swift/AST/Decl.h b/include/swift/AST/Decl.h
@@ -5128,6 +5128,10 @@ class ProtocolDecl final : public NominalTypeDecl {
   /// view of the generic system; see RequirementSignature.h for details.
   RequirementSignature getRequirementSignature() const;
 
+  /// Sometimes we want to make a fake generic signature from the requirements
+  /// of a requirement signature.
+  GenericSignature getRequirementSignatureAsGenericSignature() const;
+
   /// Is the requirement signature currently being computed?
   bool isComputingRequirementSignature() const;
 
diff --git a/include/swift/AST/DeclContext.h b/include/swift/AST/DeclContext.h
@@ -392,12 +392,6 @@ class alignas(1 << DeclContextAlignInBits) DeclContext
   LLVM_READONLY
   VarDecl *getNonLocalVarDecl() const;
 
-  /// Retrieve the generic parameter 'Self' from a protocol or
-  /// protocol extension.
-  ///
-  /// Only valid if \c getSelfProtocolDecl().
-  GenericTypeParamType *getProtocolSelfType() const;
-
   /// Gets the type being declared by this context.
   ///
   /// - Generic types return a bound generic type using archetypes.
diff --git a/lib/AST/ASTDumper.cpp b/lib/AST/ASTDumper.cpp
@@ -679,9 +679,8 @@ namespace {
 
       OS << " requirement signature=";
       if (PD->isRequirementSignatureComputed()) {
-        auto requirements = PD->getRequirementSignature().getRequirements();
-        OS << GenericSignature::get({PD->getProtocolSelfType()}, requirements)
-                ->getAsString();
+        auto requirements = PD->getRequirementSignatureAsGenericSignature();
+        OS << requirements->getAsString();
       } else {
         OS << "<null>";
       }
diff --git a/lib/AST/ASTMangler.cpp b/lib/AST/ASTMangler.cpp
@@ -3649,7 +3649,7 @@ void ASTMangler::appendDependentProtocolConformance(
 
     // Inherited conformance.
     bool isInheritedConformance =
-      entry.first->isEqual(currentProtocol->getProtocolSelfType());
+      entry.first->isEqual(currentProtocol->getSelfInterfaceType());
     if (isInheritedConformance) {
       appendProtocolName(entry.second);
       // For now, this is never an unknown index and so must be adjusted by 2.
diff --git a/lib/AST/ASTPrinter.cpp b/lib/AST/ASTPrinter.cpp
@@ -1444,7 +1444,7 @@ struct RequirementPrintLocation {
 /// callers check if the location is the ATD.
 static RequirementPrintLocation
 bestRequirementPrintLocation(ProtocolDecl *proto, const Requirement &req) {
-  auto protoSelf = proto->getProtocolSelfType();
+  auto protoSelf = proto->getSelfInterfaceType();
   // Returns the most relevant decl within proto connected to outerType (or null
   // if one doesn't exist), and whether the type is an "direct use",
   // i.e. outerType itself is Self or Self.T, but not, say, Self.T.U, or
@@ -1535,14 +1535,13 @@ bestRequirementPrintLocation(ProtocolDecl *proto, const Requirement &req) {
 void PrintAST::printInheritedFromRequirementSignature(ProtocolDecl *proto,
                                                       Decl *attachingTo) {
   printGenericSignature(
-      GenericSignature::get({proto->getProtocolSelfType()} ,
-                            proto->getRequirementSignature().getRequirements()),
+      proto->getRequirementSignatureAsGenericSignature(),
       PrintInherited,
       [&](const Requirement &req) {
         // Skip the inferred 'Self : AnyObject' constraint if this is an
         // @objc protocol.
         if ((req.getKind() == RequirementKind::Layout) &&
-            req.getFirstType()->isEqual(proto->getProtocolSelfType()) &&
+            req.getFirstType()->isEqual(proto->getSelfInterfaceType()) &&
             req.getLayoutConstraint()->getKind() ==
                 LayoutConstraintKind::Class &&
             proto->isObjC()) {
@@ -1560,8 +1559,7 @@ void PrintAST::printWhereClauseFromRequirementSignature(ProtocolDecl *proto,
   if (isa<AssociatedTypeDecl>(attachingTo))
     flags |= SwapSelfAndDependentMemberType;
   printGenericSignature(
-      GenericSignature::get({proto->getProtocolSelfType()} ,
-                            proto->getRequirementSignature().getRequirements()),
+      proto->getRequirementSignatureAsGenericSignature(),
       flags,
       [&](const Requirement &req) {
         auto location = bestRequirementPrintLocation(proto, req);
diff --git a/lib/AST/Decl.cpp b/lib/AST/Decl.cpp
@@ -6331,6 +6331,12 @@ RequirementSignature ProtocolDecl::getRequirementSignature() const {
                RequirementSignature());
 }
 
+GenericSignature ProtocolDecl::getRequirementSignatureAsGenericSignature() const {
+  return GenericSignature::get(
+      {getSelfInterfaceType()->castTo<GenericTypeParamType>()},
+      getRequirementSignature().getRequirements());
+}
+
 bool ProtocolDecl::isComputingRequirementSignature() const {
   return getASTContext().evaluator.hasActiveRequest(
                  RequirementSignatureRequest{const_cast<ProtocolDecl*>(this)});
@@ -7852,16 +7858,7 @@ ParamDecl *ParamDecl::createImplicit(ASTContext &Context,
 
 /// Retrieve the type of 'self' for the given context.
 Type DeclContext::getSelfTypeInContext() const {
-  assert(isTypeContext());
-
-  // For a protocol or extension thereof, the type is 'Self'.
-  if (getSelfProtocolDecl()) {
-    auto selfType = getProtocolSelfType();
-    if (!selfType)
-      return ErrorType::get(getASTContext());
-    return mapTypeIntoContext(selfType);
-  }
-  return getDeclaredTypeInContext();
+  return mapTypeIntoContext(getSelfInterfaceType());
 }
 
 TupleType *BuiltinTupleDecl::getTupleSelfType() const {
@@ -7895,16 +7892,16 @@ Type DeclContext::getSelfInterfaceType() const {
     if (auto *builtinTupleDecl = dyn_cast<BuiltinTupleDecl>(nominalDecl))
       return builtinTupleDecl->getTupleSelfType();
 
-    // For a protocol or extension thereof, the type is 'Self'.
     if (isa<ProtocolDecl>(nominalDecl)) {
-      auto selfType = getProtocolSelfType();
-      if (!selfType)
-        return ErrorType::get(getASTContext());
-      return selfType;
+      auto *genericParams = nominalDecl->getGenericParams();
+      return genericParams->getParams().front()
+          ->getDeclaredInterfaceType();
     }
+
+    return getDeclaredInterfaceType();
   }
 
-  return getDeclaredInterfaceType();
+  return ErrorType::get(getASTContext());
 }
 
 /// Return the full source range of this parameter.
diff --git a/lib/AST/DeclContext.cpp b/lib/AST/DeclContext.cpp
@@ -95,24 +95,6 @@ VarDecl *DeclContext::getNonLocalVarDecl() const {
   return nullptr;
 }
 
-GenericTypeParamType *DeclContext::getProtocolSelfType() const {
-  assert(getSelfProtocolDecl() && "not a protocol");
-
-  GenericParamList *genericParams;
-  if (auto proto = dyn_cast<ProtocolDecl>(this)) {
-    genericParams = proto->getGenericParams();
-  } else {
-    genericParams = cast<ExtensionDecl>(this)->getGenericParams();
-  }
-
-  if (genericParams == nullptr)
-    return nullptr;
-
-  return genericParams->getParams().front()
-      ->getDeclaredInterfaceType()
-      ->castTo<GenericTypeParamType>();
-}
-
 Type DeclContext::getDeclaredTypeInContext() const {
   if (auto declaredType = getDeclaredInterfaceType())
     return mapTypeIntoContext(declaredType);
diff --git a/lib/AST/RequirementMachine/Symbol.cpp b/lib/AST/RequirementMachine/Symbol.cpp
@@ -30,6 +30,7 @@ const StringRef Symbol::Kinds[] = {
   "assocty",
   "generic",
   "name",
+  "shape",
   "layout",
   "super",
   "concrete"
diff --git a/lib/IRGen/GenProto.cpp b/lib/IRGen/GenProto.cpp
@@ -1832,7 +1832,7 @@ void ResilientWitnessTableBuilder::collectResilientWitnesses(
       const auto &witness = entry.getBaseProtocolWitness();
       auto baseProto = witness.Requirement;
       auto proto = SILWT->getProtocol();
-      CanType selfType = proto->getProtocolSelfType()->getCanonicalType();
+      CanType selfType = proto->getSelfInterfaceType()->getCanonicalType();
       AssociatedConformance requirement(proto, selfType, baseProto);
       ProtocolConformanceRef inheritedConformance =
         ConformanceInContext.getAssociatedConformance(selfType, baseProto);
diff --git a/lib/SILGen/SILGenPoly.cpp b/lib/SILGen/SILGenPoly.cpp
@@ -6298,7 +6298,7 @@ getWitnessFunctionType(TypeExpansionContext context, SILGenModule &SGM,
 static std::pair<CanType, ProtocolConformanceRef>
 getSelfTypeAndConformanceForWitness(SILDeclRef witness, SubstitutionMap subs) {
   auto protocol = cast<ProtocolDecl>(witness.getDecl()->getDeclContext());
-  auto selfParam = protocol->getProtocolSelfType()->getCanonicalType();
+  auto selfParam = protocol->getSelfInterfaceType()->getCanonicalType();
   auto type = subs.getReplacementTypes()[0];
   auto conf = subs.lookupConformance(selfParam, protocol);
   return {type->getCanonicalType(), conf};
diff --git a/lib/SILOptimizer/Utils/Devirtualize.cpp b/lib/SILOptimizer/Utils/Devirtualize.cpp
@@ -1201,7 +1201,7 @@ static bool canDevirtualizeWitnessMethod(ApplySite applySite, bool isMandatory)
   if (!interfaceTy->hasTypeParameter())
     return true;
 
-  auto *const selfGP = wmi->getLookupProtocol()->getProtocolSelfType();
+  auto selfGP = wmi->getLookupProtocol()->getSelfInterfaceType();
   auto isSelfRootedTypeParameter = [selfGP](Type T) -> bool {
     if (!T->hasTypeParameter())
       return false;
diff --git a/lib/Sema/CSSimplify.cpp b/lib/Sema/CSSimplify.cpp
@@ -8577,7 +8577,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
 
           if (auto *protocolDecl =
                   memberRef->getDeclContext()->getSelfProtocolDecl()) {
-            auto selfTy = protocolDecl->getProtocolSelfType();
+            auto selfTy = protocolDecl->getSelfInterfaceType();
             if (selfTy->isEqual(requirement.getFirstType())) {
               auto *fix = AllowInvalidStaticMemberRefOnProtocolMetatype::create(
                 *this, memberLoc);
diff --git a/lib/Sema/ConstraintSystem.cpp b/lib/Sema/ConstraintSystem.cpp
@@ -6423,7 +6423,7 @@ Type constraints::getConcreteReplacementForProtocolSelfType(ValueDecl *member) {
     signature = DC->getGenericSignatureOfContext();
   }
 
-  auto selfTy = DC->getProtocolSelfType();
+  auto selfTy = DC->getSelfInterfaceType();
   return signature->getConcreteType(selfTy);
 }
 
diff --git a/lib/Sema/TypeCheckAttr.cpp b/lib/Sema/TypeCheckAttr.cpp
@@ -4105,7 +4105,7 @@ void AttributeChecker::visitNonEphemeralAttr(NonEphemeralAttr *attr) {
   // ... or the protocol Self type.
   auto *outerDC = param->getDeclContext()->getParent();
   if (outerDC->getSelfProtocolDecl() &&
-      type->isEqual(outerDC->getProtocolSelfType())) {
+      type->isEqual(outerDC->getSelfInterfaceType())) {
     return;
   }
 
diff --git a/lib/Sema/TypeCheckAvailability.cpp b/lib/Sema/TypeCheckAvailability.cpp
@@ -4044,7 +4044,7 @@ swift::diagnoseConformanceAvailability(SourceLoc loc,
     if (!depTy && !replacementTy)
       return;
 
-    Type selfTy = rootConf->getProtocol()->getProtocolSelfType();
+    Type selfTy = rootConf->getProtocol()->getSelfInterfaceType();
     if (!depTy->isEqual(selfTy)) {
       auto &ctx = DC->getASTContext();
       ctx.Diags.diagnose(
diff --git a/lib/Sema/TypeCheckDeclPrimary.cpp b/lib/Sema/TypeCheckDeclPrimary.cpp
@@ -3189,10 +3189,7 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
         TypeChecker::inferDefaultWitnesses(PD);
 
     if (PD->getASTContext().TypeCheckerOpts.DebugGenericSignatures) {
-      auto sig =
-        GenericSignature::get({PD->getProtocolSelfType()},
-                              reqSig.getRequirements());
-
+      auto sig = PD->getRequirementSignatureAsGenericSignature();
       llvm::errs() << "\n";
       llvm::errs() << "Protocol requirement signature:\n";
       PD->dumpRef(llvm::errs());
diff --git a/test/Generics/analyze_requirement_machine.swift b/test/Generics/analyze_requirement_machine.swift
@@ -0,0 +1,3 @@
+// RUN: %target-typecheck-verify-swift -analyze-requirement-machine
+
+public func f<T: FixedWidthInteger>(_: T) {}
