AST: Move 'private set' attribute computation to SetterAccessLevelRequest

Author: slavapestov

lib/AST/AccessRequests.cpp

@@ -148,12 +148,37 @@ void AccessLevelRequest::cacheResult(AccessLevel value) const {
 // the cycle of computation associated with formal accesses, we give it its own
 // request.
 
+// In a .swiftinterface file, a stored property with an explicit @_hasStorage
+// attribute but no setter is assumed to have originally been a private(set).
+static bool isStoredWithPrivateSetter(VarDecl *VD) {
+  auto *HSA = VD->getAttrs().getAttribute<HasStorageAttr>();
+  if (!HSA || HSA->isImplicit())
+    return false;
+
+  auto *DC = VD->getDeclContext();
+  auto *SF = DC->getParentSourceFile();
+  if (!SF || SF->Kind != SourceFileKind::Interface)
+    return false;
+
+  if (VD->isLet() ||
+      (VD->getSetter() &&
+       !VD->getSetter()->isImplicit()))
+    return false;
+
+  return true;
+}
+
 llvm::Expected<AccessLevel>
 SetterAccessLevelRequest::evaluate(Evaluator &evaluator,
                                    AbstractStorageDecl *ASD) const {
   assert(!ASD->Accessors.getInt().hasValue());
-  if (auto *AA = ASD->getAttrs().getAttribute<SetterAccessAttr>())
-    return AA->getAccess();
+  if (auto *SAA = ASD->getAttrs().getAttribute<SetterAccessAttr>())
+    return SAA->getAccess();
+
+  if (auto *VD = dyn_cast<VarDecl>(ASD))
+    if (isStoredWithPrivateSetter(VD))
+      return AccessLevel::Private;
+
   return ASD->getFormalAccess();
 }
 

lib/Parse/ParseDecl.cpp

@@ -5024,14 +5024,6 @@ static StorageImplInfo classifyWithHasStorageAttr(
     return false;
   };
 
-  // Determines if the storage had a private setter, i.e. it's not a 'let' and
-  // it had a setter.
-  auto isPrivateSet = [&]() {
-    if (auto varDecl = dyn_cast<VarDecl>(storage))
-      return !varDecl->isLet() && accessors.Set == nullptr;
-    return false;
-  };
-
   // Default to stored writes.
   WriteImplKind writeImpl = WriteImplKind::Stored;
   ReadWriteImplKind readWriteImpl = ReadWriteImplKind::Stored;
@@ -5048,14 +5040,6 @@ static StorageImplInfo classifyWithHasStorageAttr(
     readWriteImpl = ReadWriteImplKind::Immutable;
   }
 
-  if (isPrivateSet()) {
-    // If we saw a 'var' with no setter, that means it was
-    // private/internal(set). Honor that with a synthesized attribute.
-    storage->getAttrs().add(
-      new (ctx) SetterAccessAttr(
-        SourceLoc(), SourceLoc(), AccessLevel::Private, /*implicit: */true));
-  }
-
   // Always force Stored reads if @_hasStorage is present.
   return StorageImplInfo(ReadImplKind::Stored, writeImpl, readWriteImpl);
 }