[Distributed] remove DistributedAvailability, reuse Concurrency one

Author: ktoso

include/swift/AST/ASTContext.h

@@ -753,9 +753,6 @@ class ASTContext final {
   /// Get the runtime availability of support for concurrency.
   AvailabilityContext getConcurrencyAvailability();
 
-  /// Get the runtime availability of support for distributed actors.
-  AvailabilityContext getDistributedAvailability();
-
   /// Get the runtime availability of support for differentiation.
   AvailabilityContext getDifferentiationAvailability();
 

include/swift/Frontend/Frontend.h

@@ -533,10 +533,6 @@ class CompilerInstance {
   /// i.e. if it can be found.
   bool canImportSwiftConcurrency() const;
 
-  /// Whether the Distributed actors support library can be imported
-  /// i.e. if it can be found.
-  bool canImportSwiftDistributed() const;
-
   /// Gets the SourceFile which is the primary input for this CompilerInstance.
   /// \returns the primary SourceFile, or nullptr if there is no primary input;
   /// if there are _multiple_ primary inputs, fails with an assertion.

include/swift/Runtime/RuntimeFunctions.def

@@ -1692,15 +1692,15 @@ FUNCTION(DefaultActorDeallocateResilient,
 // );
 FUNCTION(DistributedActorInitializeRemote,
          swift_distributedActor_remote_initialize, SwiftCC,
-         DistributedAvailability,
+         ConcurrencyAvailability, // TODO(distributed): Introduce DistributedAvailability once shipping somewhere
          RETURNS(OpaquePtrTy),
          ARGS(TypeMetadataPtrTy),
          ATTRS(NoUnwind))
 
 // void swift_distributedActor_destroy(DefaultActor *actor);
 FUNCTION(DistributedActorDestroy,
          swift_distributedActor_destroy, SwiftCC,
-         DistributedAvailability,
+         ConcurrencyAvailability, // TODO(distributed): Introduce DistributedAvailability once shipping somewhere
          RETURNS(VoidTy),
          ARGS(RefCountedPtrTy),
          ATTRS(NoUnwind))

lib/AST/Availability.cpp

@@ -330,10 +330,6 @@ AvailabilityContext ASTContext::getConcurrencyAvailability() {
   return getSwift55Availability();
 }
 
-AvailabilityContext ASTContext::getDistributedAvailability() {
-  return getSwift55Availability(); // FIXME(distributed): getSwiftFutureAvailability perhaps? The module is not shipping in any release so far so it does not matter for real though.
-}
-
 AvailabilityContext ASTContext::getDifferentiationAvailability() {
   return getSwiftFutureAvailability();
 }

lib/Frontend/Frontend.cpp

@@ -819,11 +819,6 @@ bool CompilerInstance::canImportSwiftConcurrency() const {
       {getASTContext().getIdentifier(SWIFT_CONCURRENCY_NAME), SourceLoc()});
 }
 
-bool CompilerInstance::canImportSwiftDistributed() const {
-  return getASTContext().canImportModule(
-      {getASTContext().getIdentifier(SWIFT_DISTRIBUTED_NAME), SourceLoc()});
-}
-
 ImplicitImportInfo CompilerInstance::getImplicitImportInfo() const {
   auto &frontendOpts = Invocation.getFrontendOptions();
 

lib/IRGen/IRGenModule.cpp

@@ -786,14 +786,6 @@ namespace RuntimeConstants {
     return RuntimeAvailability::AlwaysAvailable;
   }
 
-  RuntimeAvailability DistributedAvailability(ASTContext &context) {
-    auto featureAvailability = context.getDistributedAvailability();
-    if (!isDeploymentAvailabilityContainedIn(context, featureAvailability)) {
-      return RuntimeAvailability::ConditionallyAvailable;
-    }
-    return RuntimeAvailability::AlwaysAvailable;
-  }
-
   RuntimeAvailability DifferentiationAvailability(ASTContext &context) {
     auto featureAvailability = context.getDifferentiationAvailability();
     if (!isDeploymentAvailabilityContainedIn(context, featureAvailability)) {

lib/Sema/TypeCheckAvailability.cpp

@@ -1702,24 +1702,6 @@ void TypeChecker::checkConcurrencyAvailability(SourceRange ReferenceRange,
   }
 }
 
-void TypeChecker::checkDistributedAvailability(SourceRange ReferenceRange,
-                                               const DeclContext *ReferenceDC) {
-  // Check the availability of concurrency runtime support.
-  ASTContext &ctx = ReferenceDC->getASTContext();
-  if (ctx.LangOpts.DisableAvailabilityChecking)
-    return;
-
-  auto runningOS =
-    TypeChecker::overApproximateAvailabilityAtLocation(
-      ReferenceRange.Start, ReferenceDC);
-  auto availability = ctx.getDistributedAvailability();
-  if (!runningOS.isContainedIn(availability)) {
-    diagnosePotentialConcurrencyUnavailability(
-      ReferenceRange, ReferenceDC,
-      UnavailabilityReason::requiresVersionRange(availability.getOSVersion()));
-  }
-}
-
 void TypeChecker::diagnosePotentialUnavailability(
     const ValueDecl *D, SourceRange ReferenceRange,
     const DeclContext *ReferenceDC,

lib/Sema/TypeCheckDeclPrimary.cpp

@@ -2418,11 +2418,9 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
 
     TypeChecker::checkDeclAttributes(CD);
 
-    if (CD->isActor()) {
+    if (CD->isActor())
       TypeChecker::checkConcurrencyAvailability(CD->getLoc(), CD);
-      if (CD->isDistributedActor())
-        TypeChecker::checkDistributedAvailability(CD->getLoc(), CD);
-    }
+
     for (Decl *Member : CD->getABIMembers())
       visit(Member);
 

lib/Sema/TypeChecker.h

@@ -1026,9 +1026,6 @@ void checkDistributedActor(ClassDecl *decl);
 void checkConcurrencyAvailability(SourceRange ReferenceRange,
                                   const DeclContext *ReferenceDC);
 
-void checkDistributedAvailability(SourceRange ReferenceRange,
-                                  const DeclContext *ReferenceDC);
-
 /// Emits a diagnostic for a reference to a storage accessor that is
 /// potentially unavailable.
 void diagnosePotentialAccessorUnavailability(