cleanup

Author: ktoso

include/swift/AST/Decl.h

@@ -502,7 +502,7 @@ class alignas(1 << DeclAlignInBits) Decl {
     IsDebuggerAlias : 1
   );
 
-  SWIFT_INLINE_BITFIELD(NominalTypeDecl, GenericTypeDecl, 1+1+1+1,
+  SWIFT_INLINE_BITFIELD(NominalTypeDecl, GenericTypeDecl, 1+1+1,
     /// Whether we have already added implicitly-defined initializers
     /// to this declaration.
     AddedImplicitInitializers : 1,
@@ -511,10 +511,7 @@ class alignas(1 << DeclAlignInBits) Decl {
     HasLazyConformances : 1,
 
     /// Whether this nominal type is having its semantic members resolved.
-    IsComputingSemanticMembers : 1,
-
-    /// Whether we have already added implicitly-defined distributed actor members.
-    AddedImplicitDistributedActorMembers: 1
+    IsComputingSemanticMembers : 1
   );
 
   SWIFT_INLINE_BITFIELD_FULL(ProtocolDecl, NominalTypeDecl, 1+1+1+1+1+1+1+1+1+1+1+8+16,
@@ -3163,7 +3160,6 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
     ExtensionGeneration = 0;
     Bits.NominalTypeDecl.HasLazyConformances = false;
     Bits.NominalTypeDecl.IsComputingSemanticMembers = false;
-    Bits.NominalTypeDecl.AddedImplicitDistributedActorMembers = false;
   }
 
   friend class ProtocolType;
@@ -3201,17 +3197,6 @@ class NominalTypeDecl : public GenericTypeDecl, public IterableDeclContext {
     Bits.NominalTypeDecl.AddedImplicitInitializers = true;
   }
 
-  /// Determine whether we have already attempted to add any
-  /// implicitly-defined distributed actor members to this declaration.
-  bool addedImplicitDistributedActorMembers() const {
-    return Bits.NominalTypeDecl.AddedImplicitInitializers;
-  }
-
-  /// Note that we have attempted to add implicit initializers.
-  void setAddedImplicitDistributedActorMembers() {
-    Bits.NominalTypeDecl.AddedImplicitInitializers = true;
-  }
-
   /// getDeclaredType - Retrieve the type declared by this entity, without
   /// any generic parameters bound if this is a generic type.
   ///

include/swift/AST/TypeCheckRequests.h

@@ -933,24 +933,6 @@ class IsDistributedActorRequest :
     bool isCached() const { return true; }
 };
 
-/// Determine whether the given func is distributed.
-class IsDistributedFuncRequest :
-    public SimpleRequest<IsDistributedFuncRequest,
-        bool(FuncDecl *),
-        RequestFlags::Cached> {
-public:
-    using SimpleRequest::SimpleRequest;
-
-private:
-    friend SimpleRequest;
-
-    bool evaluate(Evaluator &evaluator, FuncDecl *func) const;
-
-public:
-    // Caching
-    bool isCached() const { return true; }
-};
-
 /// Obtain the 'remote' counterpart of a 'distributed func'.
 class GetDistributedRemoteFuncRequest :
     public SimpleRequest<GetDistributedRemoteFuncRequest,

include/swift/AST/TypeCheckerTypeIDZone.def

@@ -100,8 +100,6 @@ SWIFT_REQUEST(TypeChecker, IsDefaultActorRequest,
               Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, IsDistributedActorRequest, bool(NominalTypeDecl *),
               Cached, NoLocationInfo)
-SWIFT_REQUEST(TypeChecker, IsDistributedFuncRequest, bool(FuncDecl *),
-              Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, GetDistributedRemoteFuncRequest, AbstractFunctionDecl *(AbstractFunctionDecl *),
               Cached, NoLocationInfo)
 SWIFT_REQUEST(TypeChecker, GlobalActorInstanceRequest,

lib/AST/Decl.cpp

@@ -7221,11 +7221,6 @@ bool AbstractFunctionDecl::isSendable() const {
 
 bool AbstractFunctionDecl::isDistributed() const {
   return this->getAttrs().hasAttribute<DistributedActorAttr>();
-
-//  auto mutableFunc = const_cast<FuncDecl *>(func);
-//  return evaluateOrDefault(getASTContext().evaluator,
-//                           IsDistributedFuncRequest{mutableFunc},
-//                           false);
 }
 
 AbstractFunctionDecl*

lib/Sema/TypeCheckDistributed.cpp

@@ -71,12 +71,6 @@ bool IsDistributedActorRequest::evaluate(
   return classDecl->isExplicitDistributedActor();
 }
 
-bool IsDistributedFuncRequest::evaluate(
-    Evaluator &evaluator, FuncDecl *func) const {
-  // Check whether the attribute was explicitly specified.
-  return func->getAttrs().hasAttribute<DistributedActorAttr>();
-}
-
 AbstractFunctionDecl *GetDistributedRemoteFuncRequest::evaluate(
     Evaluator &evaluator, AbstractFunctionDecl *func) const {
   if (!func->isDistributed())