---

yaml
---
r: 348115
b: refs/heads/master
c: 911d205
h: refs/heads/master
i:
  348113: 83ec6ff
  348111: 88d91f3

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 1bf7d48111a10a57c8344281df58346bb1e61bd5
+refs/heads/master: 911d2056285fb34d02906bed8bcb2d69e28f408a
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/include/swift/AST/DiagnosticsSema.def

@@ -3985,6 +3985,11 @@ ERROR(dynamic_with_transparent,none,
       "a declaration cannot be both '@_tranparent' and 'dynamic'",
       ())
 
+ERROR(dynamic_and_library_evolution_not_supported,none,
+      "marking non-'@objc' Swift declaration 'dynamic' in library evolution mode is not supported",
+      ())
+
+
 //------------------------------------------------------------------------------
 // MARK: @_dynamicReplacement(for:)
 //------------------------------------------------------------------------------

trunk/lib/Sema/TypeCheckAttr.cpp

@@ -333,9 +333,12 @@ void AttributeEarlyChecker::visitDynamicAttr(DynamicAttr *attr) {
   // Members cannot be both dynamic and @_transparent.
   if (D->getAttrs().hasAttribute<TransparentAttr>())
     diagnoseAndRemoveAttr(attr, diag::dynamic_with_transparent);
+  if (!D->getAttrs().hasAttribute<ObjCAttr>() &&
+      D->getModuleContext()->isResilient())
+    diagnoseAndRemoveAttr(attr,
+                          diag::dynamic_and_library_evolution_not_supported);
 }
 
-
 void AttributeEarlyChecker::visitIBActionAttr(IBActionAttr *attr) {
   // Only instance methods can be IBActions.
   const FuncDecl *FD = cast<FuncDecl>(D);

trunk/test/attr/dynamicReplacement_library_evolution.swift

@@ -0,0 +1,17 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-typecheck-verify-swift -swift-version 5 -enable-objc-interop -enable-library-evolution  -I %t 
+
+struct Container {
+  dynamic var property: Int { return 1 } // expected-error{{marking non-'@objc' Swift declaration 'dynamic' in library evolution mode is not supported}}
+  dynamic func foo() {} // expected-error{{marking non-'@objc' Swift declaration 'dynamic' in library evolution mode is not supported}}
+}
+
+class AClass {
+  dynamic var property: Int { return 1 } // expected-error{{marking non-'@objc' Swift declaration 'dynamic' in library evolution mode is not supported}}
+  dynamic func foo() {} // expected-error{{marking non-'@objc' Swift declaration 'dynamic' in library evolution mode is not supported}}
+
+  @objc dynamic func allowed() {}
+
+
+  @objc dynamic var allowedProperty : Int { return 1}
+}

trunk/test/attr/dynamicReplacement_library_evolution_implicit_dynamic.swift

@@ -0,0 +1,17 @@
+// RUN: %empty-directory(%t)
+// RUN: %target-typecheck-verify-swift -swift-version 5 -enable-objc-interop -enable-library-evolution -enable-implicit-dynamic -I %t
+
+struct Container {
+  var property: Int { return 1 }
+  func foo() {}
+}
+
+class AClass {
+  var property: Int { return 1 }
+  func foo() {}
+
+  @objc dynamic func allowed() {}
+
+
+  @objc dynamic var allowedProperty : Int { return 1}
+}