Let access notes apply to accessors

`Name: ‘getter:Context.property()’` now applies an access note to a getter of Context.property, and `Name: ‘setter:Context.property(_:)’` applies one to its setter. Additionally, access notes without `getter:` or `setter:` now cannot apply to accessors.

Author: beccadax

include/swift/AST/AccessNotes.h

@@ -19,6 +19,7 @@
 #define ACCESSNOTES_H
 
 #include "swift/AST/Identifier.h"
+#include "swift/AST/StorageImpl.h"
 #include "swift/Basic/NullablePtr.h"
 #include "llvm/Support/Error.h"
 #include "llvm/Support/MemoryBuffer.h"
@@ -33,6 +34,7 @@ class AccessNoteDeclName {
 public:
   std::vector<Identifier> parentNames;
   DeclName name;
+  Optional<AccessorKind> accessorKind;
 
   AccessNoteDeclName(ASTContext &ctx, StringRef str);
   AccessNoteDeclName();

lib/AST/AccessNotes.cpp

@@ -62,7 +62,8 @@ parseObjCSelector(swift::ASTContext &ctx, llvm::StringRef string) {
 
 namespace swift {
 
-AccessNoteDeclName::AccessNoteDeclName() : parentNames(), name() { }
+AccessNoteDeclName::AccessNoteDeclName()
+  : parentNames(), name(), accessorKind(None) { }
 
 AccessNoteDeclName::AccessNoteDeclName(ASTContext &ctx, StringRef str) {
   auto parsedName = parseDeclName(str);
@@ -73,6 +74,13 @@ AccessNoteDeclName::AccessNoteDeclName(ASTContext &ctx, StringRef str) {
     parentNames.push_back(ctx.getIdentifier(first));
   }
 
+  if (parsedName.IsGetter)
+    accessorKind = AccessorKind::Get;
+  else if (parsedName.IsSetter)
+    accessorKind = AccessorKind::Set;
+  else
+    accessorKind = None;
+
   name = parsedName.formDeclName(ctx);
 
   // FIXME: parseDeclName() doesn't handle the special `subscript` name.
@@ -84,10 +92,20 @@ AccessNoteDeclName::AccessNoteDeclName(ASTContext &ctx, StringRef str) {
 }
 
 bool AccessNoteDeclName::matches(ValueDecl *VD) const {
+  // These are normally just `VD` and `name`, but not for accessors.
   auto lookupVD = VD;
-  if (auto accessor = dyn_cast<AccessorDecl>(VD))
-    VD = accessor->getStorage();
 
+  // First, we check if the accessor-ness of `VD` matches the accessor-ness of
+  // the name, and update `lookupVD` if necessary.
+  if (auto accessor = dyn_cast<AccessorDecl>(VD)) {
+    if (!accessorKind || *accessorKind != accessor->getAccessorKind())
+      return false;
+    lookupVD = accessor->getStorage();
+  }
+  else if (accessorKind.hasValue())
+    return false;
+
+  // Check that `name` matches `lookupVD`.
   if (!lookupVD->getName().matchesRef(name))
     return false;
 
@@ -125,6 +143,9 @@ bool AccessNoteDeclName::empty() const {
 }
 
 void AccessNoteDeclName::print(llvm::raw_ostream &os) const {
+  if (accessorKind)
+    os << getAccessorLabel(*accessorKind) << "ter:";
+
   for (auto parentName : parentNames)
     os << parentName << '.';
   name.print(os, /*skipEmptyArgumentNames=*/false);
@@ -259,7 +280,7 @@ StringRef MappingTraits<AccessNote>::validate(IO &io, AccessNote &note) {
     if (!note.ObjC)
       note.ObjC = true;
     else if (!*note.ObjC)
-    return "cannot have an 'ObjCName' if 'ObjC' is false";
+      return "cannot have an 'ObjCName' if 'ObjC' is false";
   }
 
   return "";

test/SILGen/Inputs/objc_access_notes.accessnotes

@@ -32,7 +32,10 @@ Notes:
   ObjC: true
 - Name: 'Hoozit.propComputed'
   ObjC: true
-  # FIXME: Add a way to specify getter and setter names in an access note
+- Name: 'getter:Hoozit.propComputed()'
+  ObjCName: 'initPropComputedGetter'
+- Name: 'setter:Hoozit.propComputed(_:)'
+  ObjCName: 'initPropComputedSetter:'
 - Name: 'Hoozit.roProperty'
   ObjC: true
 - Name: 'Hoozit.rwProperty'

test/SILGen/objc_access_notes.swift

@@ -352,9 +352,12 @@ class Hoozit : Gizmo {
   // expected-warning@+2 {{access note for fancy test suite adds attribute 'objc' to this property}}
   // expected-note@+1 {{add attribute explicitly to silence this warning}} {{3-3=@objc }}
   var propComputed: Gizmo {
-    // FIXME: Add a way to specify these names in an access note.
-    @objc(initPropComputedGetter) get { return self }
-    @objc(initPropComputedSetter:) set {}
+    // expected-warning@+2 {{access note for fancy test suite adds attribute 'objc' to this getter}}
+    // expected-note@+1 {{add attribute explicitly to silence this warning}} {{5-5=@objc(initPropComputedGetter) }}
+    get { return self }
+    // expected-warning@+2 {{access note for fancy test suite adds attribute 'objc' to this setter}}
+    // expected-note@+1 {{add attribute explicitly to silence this warning}} {{5-5=@objc(initPropComputedSetter:) }}
+    set {}
   }
   // -- getter
   // CHECK-LABEL: sil hidden [thunk] [ossa] @$s11objc_thunks6HoozitC12propComputedSo5GizmoCvgTo : $@convention(objc_method) (Hoozit) -> @autoreleased Gizmo {