[AST] Remove initializes and accesses attr reference

Author: LucianoPAlmeida

include/swift/AST/Attr.def

@@ -345,12 +345,6 @@ SIMPLE_DECL_ATTR(_marker, Marker,
 SIMPLE_DECL_ATTR(reasync, AtReasync,
   OnProtocol | ConcurrencyOnly | ABIBreakingToAdd | ABIBreakingToRemove | APIBreakingToAdd | APIBreakingToRemove,
   110)
-DECL_ATTR(initializes, Initializes,
-  OnAccessor | ABIStableToAdd | ABIStableToRemove | APIBreakingToAdd | APIBreakingToRemove,
-  111)
-DECL_ATTR(accesses, Accesses,
-  OnAccessor | ABIStableToAdd | ABIStableToRemove | APIBreakingToAdd | APIBreakingToRemove,
-  113)
 SIMPLE_DECL_ATTR(_unsafeInheritExecutor, UnsafeInheritExecutor,
   OnFunc | UserInaccessible | ABIStableToAdd | ABIStableToRemove | APIStableToAdd | APIBreakingToRemove,
   114)

include/swift/AST/Attr.h

@@ -1555,68 +1555,6 @@ class SpecializeAttr final
   }
 };
 
-class InitializesAttr final
-    : public DeclAttribute,
-      private llvm::TrailingObjects<InitializesAttr, Identifier> {
-  friend TrailingObjects;
-
-  size_t numProperties;
-
-  InitializesAttr(SourceLoc atLoc, SourceRange range,
-                  ArrayRef<Identifier> properties);
-
-public:
-  static InitializesAttr *create(ASTContext &ctx,
-                                 SourceLoc atLoc, SourceRange range,
-                                 ArrayRef<Identifier> properties);
-
-  size_t numTrailingObjects(OverloadToken<Identifier>) const {
-    return numProperties;
-  }
-
-  unsigned getNumProperties() const { return numProperties; }
-
-  ArrayRef<Identifier> getProperties() const {
-    return {getTrailingObjects<Identifier>(), numProperties};
-  }
-
-  ArrayRef<VarDecl *> getPropertyDecls(AccessorDecl *attachedTo) const;
-
-  static bool classof(const DeclAttribute *DA) {
-    return DA->getKind() == DAK_Initializes;
-  }
-};
-
-class AccessesAttr final
-    : public DeclAttribute,
-      private llvm::TrailingObjects<AccessesAttr, Identifier> {
-  friend TrailingObjects;
-
-  size_t numProperties;
-
-  AccessesAttr(SourceLoc atLoc, SourceRange range,
-               ArrayRef<Identifier> properties);
-
-public:
-  static AccessesAttr *create(ASTContext &ctx,
-                              SourceLoc atLoc, SourceRange range,
-                              ArrayRef<Identifier> properties);
-
-  size_t numTrailingObjects(OverloadToken<Identifier>) const {
-    return numProperties;
-  }
-
-  ArrayRef<Identifier> getProperties() const {
-    return {getTrailingObjects<Identifier>(), numProperties};
-  }
-
-  ArrayRef<VarDecl *> getPropertyDecls(AccessorDecl *attachedTo) const;
-
-  static bool classof(const DeclAttribute *DA) {
-    return DA->getKind() == DAK_Accesses;
-  }
-};
-
 class StorageRestrictionsAttr final
     : public DeclAttribute,
       private llvm::TrailingObjects<StorageRestrictionsAttr, Identifier> {

include/swift/AST/DiagnosticsSema.def

@@ -7397,12 +7397,6 @@ ERROR(init_accessor_can_refer_only_to_properties,none,
       " to stored properties",
       (DescriptiveDeclKind, DeclNameRef))
 
-ERROR(init_accessor_initializes_attribute_on_other_declaration,none,
-      "initializes(...) attribute could only be used with init accessors",
-      ())
-ERROR(init_accessor_accesses_attribute_on_other_declaration,none,
-      "accesses(...) attribute could only be used with init accessors",
-      ())
 ERROR(storage_restrictions_attribute_not_on_init_accessor,none,
       "@storageRestrictions attribute could only be used with init accessors",
       ())

lib/AST/Attr.cpp

@@ -1661,10 +1661,6 @@ StringRef DeclAttribute::getAttrName() const {
     return "<<synthesized protocol>>";
   case DAK_Specialize:
     return "_specialize";
-  case DAK_Initializes:
-    return "initializes";
-  case DAK_Accesses:
-    return "accesses";
   case DAK_StorageRestrictions:
     return "storageRestrictions";
   case DAK_Implements:
@@ -2450,38 +2446,6 @@ TransposeAttr *TransposeAttr::create(ASTContext &context, bool implicit,
                                  std::move(originalName), parameterIndices);
 }
 
-InitializesAttr::InitializesAttr(SourceLoc atLoc, SourceRange range,
-                                 ArrayRef<Identifier> properties)
-    : DeclAttribute(DAK_Initializes, atLoc, range, /*implicit*/false),
-      numProperties(properties.size()) {
-  std::uninitialized_copy(properties.begin(), properties.end(),
-                          getTrailingObjects<Identifier>());
-}
-
-InitializesAttr *
-InitializesAttr::create(ASTContext &ctx, SourceLoc atLoc, SourceRange range,
-                        ArrayRef<Identifier> properties) {
-  unsigned size = totalSizeToAlloc<Identifier>(properties.size());
-  void *mem = ctx.Allocate(size, alignof(InitializesAttr));
-  return new (mem) InitializesAttr(atLoc, range, properties);
-}
-
-AccessesAttr::AccessesAttr(SourceLoc atLoc, SourceRange range,
-                           ArrayRef<Identifier> properties)
-    : DeclAttribute(DAK_Accesses, atLoc, range, /*implicit*/false),
-      numProperties(properties.size()) {
-  std::uninitialized_copy(properties.begin(), properties.end(),
-                          getTrailingObjects<Identifier>());
-}
-
-AccessesAttr *
-AccessesAttr::create(ASTContext &ctx, SourceLoc atLoc, SourceRange range,
-                     ArrayRef<Identifier> properties) {
-  unsigned size = totalSizeToAlloc<Identifier>(properties.size());
-  void *mem = ctx.Allocate(size, alignof(AccessesAttr));
-  return new (mem) AccessesAttr(atLoc, range, properties);
-}
-
 StorageRestrictionsAttr::StorageRestrictionsAttr(
     SourceLoc AtLoc, SourceRange Range, ArrayRef<Identifier> initializes,
     ArrayRef<Identifier> accesses, bool Implicit)
@@ -2663,26 +2627,6 @@ DeclAttributes::getEffectiveSendableAttr() const {
   return assumedAttr;
 }
 
-ArrayRef<VarDecl *>
-InitializesAttr::getPropertyDecls(AccessorDecl *attachedTo) const {
-  auto &ctx = attachedTo->getASTContext();
-  return evaluateOrDefault(
-      ctx.evaluator,
-      InitAccessorReferencedVariablesRequest{
-          const_cast<InitializesAttr *>(this), attachedTo, getProperties()},
-      {});
-}
-
-ArrayRef<VarDecl *>
-AccessesAttr::getPropertyDecls(AccessorDecl *attachedTo) const {
-  auto &ctx = attachedTo->getASTContext();
-  return evaluateOrDefault(
-      ctx.evaluator,
-      InitAccessorReferencedVariablesRequest{const_cast<AccessesAttr *>(this),
-                                             attachedTo, getProperties()},
-      {});
-}
-
 ArrayRef<VarDecl *> StorageRestrictionsAttr::getInitializesProperties(
     AccessorDecl *attachedTo) const {
   auto &ctx = attachedTo->getASTContext();

lib/AST/Decl.cpp

@@ -9567,10 +9567,6 @@ ArrayRef<VarDecl *> AccessorDecl::getInitializedProperties() const {
   if (auto *SR = getAttrs().getAttribute<StorageRestrictionsAttr>())
     return SR->getInitializesProperties(const_cast<AccessorDecl *>(this));
 
-  // Fallback to old effect style declaration.
-  if (auto *initAttr = getAttrs().getAttribute<InitializesAttr>())
-    return initAttr->getPropertyDecls(const_cast<AccessorDecl *>(this));
-
   return {};
 }
 
@@ -9580,10 +9576,6 @@ ArrayRef<VarDecl *> AccessorDecl::getAccessedProperties() const {
   if (auto *SR = getAttrs().getAttribute<StorageRestrictionsAttr>())
     return SR->getAccessesProperties(const_cast<AccessorDecl *>(this));
 
-  // Fallback to old effect style declaration.
-  if (auto *accessAttr = getAttrs().getAttribute<AccessesAttr>())
-    return accessAttr->getPropertyDecls(const_cast<AccessorDecl *>(this));
-
   return {};
 }