Merge pull request #6419 from jrose-apple/keep-properties-and-accessors-on-the-same-page

Don't infer 'dynamic' on accessors in extensions of ObjC classes.

Author: jrose-apple

lib/Sema/TypeCheckDecl.cpp

@@ -2275,6 +2275,12 @@ static void inferDynamic(ASTContext &ctx, ValueDecl *D) {
     if (VD->isLet() && !isNSManaged) return;
   }
 
+  // Accessors should not infer 'dynamic' on their own; they can get it from
+  // their storage decls.
+  if (auto FD = dyn_cast<FuncDecl>(D))
+    if (FD->isAccessor())
+      return;
+
   // The presence of 'final' on a class prevents 'dynamic'.
   auto classDecl = D->getDeclContext()->getAsClassOrClassExtensionContext();
   if (!classDecl) return;
@@ -3859,6 +3865,9 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       if (isObjC && !TC.isRepresentableInObjC(SD, *isObjC))
         isObjC = None;
       markAsObjC(TC, SD, isObjC);
+
+      // Infer 'dynamic' before touching accessors.
+      inferDynamic(TC.Context, SD);
     }
 
     if (SD->hasAccessorFunctions())
@@ -3887,8 +3896,6 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
       synthesizeSetterForMutableAddressedStorage(SD, TC);
     }
 
-    inferDynamic(TC.Context, SD);
-
     TC.checkDeclAttributes(SD);
   }
 
@@ -4819,21 +4826,18 @@ class DeclChecker : public DeclVisitor<DeclChecker> {
         // The only additional condition we need to check is if the var decl
         // had an @objc or @iboutlet property.
 
-        ValueDecl *prop = cast<ValueDecl>(FD->getAccessorStorageDecl());
+        AbstractStorageDecl *storage = FD->getAccessorStorageDecl();
         // Validate the subscript or property because it might not be type
         // checked yet.
-        if (isa<SubscriptDecl>(prop))
-          TC.validateDecl(prop);
-        else if (isa<VarDecl>(prop))
-          TC.validateDecl(prop);
+        TC.validateDecl(storage);
 
-        if (prop->getAttrs().hasAttribute<NonObjCAttr>())
+        if (storage->getAttrs().hasAttribute<NonObjCAttr>())
           isObjC = None;
-        else if (!isObjC && prop->isObjC())
+        else if (!isObjC && storage->isObjC())
           isObjC = ObjCReason::DoNotDiagnose;
 
-        // If the property is dynamic, propagate to this accessor.
-        if (isObjC && prop->isDynamic() && !FD->isDynamic())
+        // If the storage is dynamic, propagate to this accessor.
+        if (isObjC && storage->isDynamic() && !FD->isDynamic())
           FD->getAttrs().add(new (TC.Context) DynamicAttr(/*implicit*/ true));
       }
 
@@ -7065,6 +7069,7 @@ void TypeChecker::validateDecl(ValueDecl *D) {
 
         markAsObjC(*this, VD, isObjC);
 
+        // Infer 'dynamic' before touching accessors.
         inferDynamic(Context, VD);
 
         // If this variable is a class member, mark it final if the

test/attr/attr_dynamic_infer.swift

@@ -54,3 +54,28 @@ extension Sub {
   override func baseFoo() {
   }
 }
+
+
+@objc class FinalTests {}
+
+extension FinalTests {
+  // CHECK:  @objc final func foo
+  final func foo() { }
+
+  // CHECK: @objc final var prop: Super
+  final var prop: Super {
+    // CHECK: @objc final get
+    get { return Super() }
+    // CHECK: @objc final set
+    set { }
+  }
+
+  // CHECK: @objc final subscript(sup: Super) -> Super
+  final subscript(sup: Super) -> Super {
+    // CHECK: @objc final get
+    get { return sup }
+    // CHECK: @objc final set
+    set { }
+  }
+}
+