---

yaml
---
r: 345147
b: refs/heads/master
c: 3437cbe
h: refs/heads/master
i:
  345145: a8d5015
  345143: 3c2d063

Author: swift-ci

[refs]

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

trunk/lib/AST/Decl.cpp

@@ -1392,22 +1392,42 @@ static bool isPolymorphic(const AbstractStorageDecl *storage) {
   return false;
 }
 
+static bool isDirectToStorageAccess(const AccessorDecl *accessor,
+                                    const VarDecl *var, bool isAccessOnSelf) {
+  // All accesses have ordinary semantics except those to variables
+  // with storage from within their own accessors.
+  if (accessor->getStorage() != var)
+    return false;
+
+  if (!var->hasStorage())
+    return false;
+
+  // In Swift 5 and later, the access must also be a member access on 'self'.
+  if (!isAccessOnSelf &&
+      var->getDeclContext()->isTypeContext() &&
+      var->getASTContext().isSwiftVersionAtLeast(5))
+    return false;
+
+  // As a special case, 'read' and 'modify' coroutines with forced static
+  // dispatch must use ordinary semantics, so that the 'modify' coroutine for a
+  // 'dynamic' property uses Objective-C message sends and not direct access to
+  // storage.
+  if (accessor->hasForcedStaticDispatch())
+    return false;
+
+  return true;
+}
+
 /// Determines the access semantics to use in a DeclRefExpr or
 /// MemberRefExpr use of this value in the specified context.
 AccessSemantics
 ValueDecl::getAccessSemanticsFromContext(const DeclContext *UseDC,
                                          bool isAccessOnSelf) const {
-  // All accesses have ordinary semantics except those to variables
-  // with storage from within their own accessors.  In Swift 5 and later,
-  // the access must also be a member access on 'self'.
-
   // The condition most likely to fast-path us is not being in an accessor,
   // so we check that first.
   if (auto *accessor = dyn_cast<AccessorDecl>(UseDC)) {
     if (auto *var = dyn_cast<VarDecl>(this)) {
-      if (accessor->getStorage() == var && var->hasStorage() &&
-          (isAccessOnSelf || !var->getDeclContext()->isTypeContext() ||
-           !var->getASTContext().isSwiftVersionAtLeast(5)))
+      if (isDirectToStorageAccess(accessor, var, isAccessOnSelf))
         return AccessSemantics::DirectToStorage;
     }
   }

trunk/lib/SIL/SILDeclRef.cpp

@@ -451,6 +451,14 @@ IsSerialized_t SILDeclRef::isSerialized() const {
       }
     }
 
+    // 'read' and 'modify' accessors synthesized on-demand are serialized if
+    // visible outside the module.
+    if (auto fn = dyn_cast<FuncDecl>(d))
+      if (!isClangImported() &&
+          fn->hasForcedStaticDispatch() &&
+          fn->getEffectiveAccess() >= AccessLevel::Public)
+        return IsSerialized;
+
     dc = getDecl()->getInnermostDeclContext();
 
     // Enum element constructors are serialized if the enum is

trunk/lib/Sema/CodeSynthesis.cpp

@@ -337,6 +337,10 @@ static void maybeMarkTransparent(TypeChecker &TC, AccessorDecl *accessor) {
     if (classDecl->checkObjCAncestry() != ObjCClassKind::NonObjC)
       return;
 
+  // Accessors synthesized on-demand are never transaprent.
+  if (accessor->hasForcedStaticDispatch())
+    return;
+
   accessor->getAttrs().add(new (TC.Context) TransparentAttr(IsImplicit));
 }
 
@@ -535,40 +539,6 @@ static Expr *buildSelfReference(VarDecl *selfDecl,
 }
 
 namespace {
-  /// A simple helper interface for buildStorageReference.
-  class StorageReferenceContext {
-    StorageReferenceContext(const StorageReferenceContext &) = delete;
-  public:
-    StorageReferenceContext() = default;
-    virtual ~StorageReferenceContext() = default;
-
-    /// Returns the declaration of the entity to use as the base of
-    /// the access, or nil if no base is required.
-    virtual VarDecl *getSelfDecl() const = 0;
-
-    /// Returns an expression producing the index value, assuming that
-    /// the storage is a subscript declaration.
-    virtual Expr *getIndexRefExpr(ASTContext &ctx,
-                                  SubscriptDecl *subscript) const = 0;
-  };
-
-  /// A reference to storage from within an accessor.
-  class AccessorStorageReferenceContext : public StorageReferenceContext {
-    AccessorDecl *Accessor;
-  public:
-    AccessorStorageReferenceContext(AccessorDecl *accessor)
-      : Accessor(accessor) {}
-    ~AccessorStorageReferenceContext() override = default;
-
-    VarDecl *getSelfDecl() const override {
-      return Accessor->getImplicitSelfDecl();
-    }
-    Expr *getIndexRefExpr(ASTContext &ctx,
-                          SubscriptDecl *subscript) const override {
-      return buildSubscriptIndexReference(ctx, Accessor);
-    }
-  };
-
   enum class TargetImpl {
     /// We're doing an ordinary storage reference.
     Ordinary,
@@ -583,8 +553,7 @@ namespace {
 } // end anonymous namespace
 
 /// Build an l-value for the storage of a declaration.
-static Expr *buildStorageReference(
-                             const StorageReferenceContext &referenceContext,
+static Expr *buildStorageReference(AccessorDecl *accessor,
                                    AbstractStorageDecl *storage,
                                    TargetImpl target,
                                    TypeChecker &TC) {
@@ -625,7 +594,7 @@ static Expr *buildStorageReference(
     break;
   }
 
-  VarDecl *selfDecl = referenceContext.getSelfDecl();
+  VarDecl *selfDecl = accessor->getImplicitSelfDecl();
   if (!selfDecl) {
     assert(target != TargetImpl::Super);
     return new (ctx) DeclRefExpr(storage, DeclNameLoc(), IsImplicit, semantics);
@@ -635,7 +604,7 @@ static Expr *buildStorageReference(
     buildSelfReference(selfDecl, selfAccessKind, TC);
 
   if (auto subscript = dyn_cast<SubscriptDecl>(storage)) {
-    Expr *indices = referenceContext.getIndexRefExpr(ctx, subscript);
+    Expr *indices = buildSubscriptIndexReference(ctx, accessor);
     return SubscriptExpr::create(ctx, selfDRE, indices, storage,
                                  IsImplicit, semantics);
   }
@@ -644,14 +613,6 @@ static Expr *buildStorageReference(
                                  DeclNameLoc(), IsImplicit, semantics);
 }
 
-static Expr *buildStorageReference(AccessorDecl *accessor,
-                                   AbstractStorageDecl *storage,
-                                   TargetImpl target,
-                                   TypeChecker &TC) {
-  return buildStorageReference(AccessorStorageReferenceContext(accessor),
-                               storage, target, TC);
-}
-
 /// Load the value of VD.  If VD is an @override of another value, we call the
 /// superclass getter.  Otherwise, we do a direct load of the value.
 static Expr *createPropertyLoadOrCallSuperclassGetter(AccessorDecl *accessor,

trunk/test/SILGen/c_modify_linkage.swift

@@ -14,7 +14,7 @@ extension NSReferencePoint: Pointable {}
 // Make sure synthesized modify accessors have shared linkage
 // for properties imported from Clang.
 
-// CHECK-LABEL: sil shared [transparent] [serializable] @$SSo7NSPointV1ySfvM
+// CHECK-LABEL: sil shared [serializable] @$SSo7NSPointV1ySfvM
 
 // CHECK-LABEL: sil shared [serializable] @$SSo16NSReferencePointC1xSfvM
 

trunk/test/SILGen/modify_objc.swift

@@ -1,4 +1,6 @@
 // RUN: %target-swift-emit-silgen(mock-sdk: %clang-importer-sdk) -enable-objc-interop -import-objc-header %S/Inputs/modify_objc.h %s | %FileCheck %s
+// RUN: %target-swift-emit-silgen(mock-sdk: %clang-importer-sdk) -enable-objc-interop -import-objc-header %S/Inputs/modify_objc.h %s -enable-resilience | %FileCheck %s --check-prefix=RESILIENT
+// RUN: %target-swift-emit-silgen(mock-sdk: %clang-importer-sdk) -enable-objc-interop -import-objc-header %S/Inputs/modify_objc.h %s -enable-testing | %FileCheck %s --check-prefix=TESTING
 
 // REQUIRES: objc_interop
 
@@ -42,3 +44,71 @@ extension ClassWithBlockProperty : ProtocolWithBlockProperty {}
 
 // CHECK-LABEL: sil shared [serializable] @$SSo22ClassWithBlockPropertyC09dependentC0ySSSgcSgvM :
 // CHECK-SAME:    $@yield_once @convention(method) (@guaranteed ClassWithBlockProperty) -> @yields @inout Optional<@callee_guaranteed (@guaranteed Optional<String>) -> ()>
+
+// Make sure 'modify' implementations for 'dynamic' properties go through
+// accessors.
+public protocol ProtocolWithIntProperty {
+  var x: Int { get set }
+}
+
+
+class HasDynamicStoredProperty : ProtocolWithIntProperty {
+  @objc dynamic var x: Int = 0
+}
+
+// CHECK-LABEL: sil shared @$S11modify_objc24HasDynamicStoredPropertyC1xSivM : $@yield_once @convention(method) (@guaranteed HasDynamicStoredProperty) -> @yields @inout Int
+// CHECK: objc_method %0 : $HasDynamicStoredProperty, #HasDynamicStoredProperty.x!getter.1.foreign
+// CHECK: yield
+// CHECK: objc_method %0 : $HasDynamicStoredProperty, #HasDynamicStoredProperty.x!setter.1.foreign
+// CHECK: return
+// CHECK: objc_method %0 : $HasDynamicStoredProperty, #HasDynamicStoredProperty.x!setter.1.foreign
+// CHECK: unwind
+
+// TESTING-LABEL: sil shared [serialized] @$S11modify_objc24HasDynamicStoredPropertyC1xSivM : $@yield_once @convention(method) (@guaranteed HasDynamicStoredProperty) -> @yields @inout Int
+
+class HasDynamicComputedProperty : ProtocolWithIntProperty {
+  @objc dynamic var x: Int { get { } set { } }
+}
+
+// CHECK-LABEL: sil shared @$S11modify_objc26HasDynamicComputedPropertyC1xSivM : $@yield_once @convention(method) (@guaranteed HasDynamicComputedProperty) -> @yields @inout Int
+// CHECK: objc_method %0 : $HasDynamicComputedProperty, #HasDynamicComputedProperty.x!getter.1.foreign
+// CHECK: yield
+// CHECK: objc_method %0 : $HasDynamicComputedProperty, #HasDynamicComputedProperty.x!setter.1.foreign
+// CHECK: return
+// CHECK: objc_method %0 : $HasDynamicComputedProperty, #HasDynamicComputedProperty.x!setter.1.foreign
+// CHECK: unwind
+
+// TESTING-LABEL: sil shared [serialized] @$S11modify_objc26HasDynamicComputedPropertyC1xSivM : $@yield_once @convention(method) (@guaranteed HasDynamicComputedProperty) -> @yields @inout Int
+
+// Make sure 'modify' implementations for public 'dynamic' properties
+// are serialized.
+public class PublicHasDynamicStoredProperty : ProtocolWithIntProperty {
+  @objc public dynamic var x: Int = 0
+}
+
+// CHECK-LABEL: sil shared [serialized] @$S11modify_objc30PublicHasDynamicStoredPropertyC1xSivM : $@yield_once @convention(method) (@guaranteed PublicHasDynamicStoredProperty) -> @yields @inout Int
+// RESILIENT-LABEL: sil shared [serialized] @$S11modify_objc30PublicHasDynamicStoredPropertyC1xSivM : $@yield_once @convention(method) (@guaranteed PublicHasDynamicStoredProperty) -> @yields @inout Int
+
+
+public class PublicHasDynamicComputedProperty : ProtocolWithIntProperty {
+  @objc public dynamic var x: Int { get { } set { } }
+}
+
+// CHECK-LABEL: sil shared [serialized] @$S11modify_objc32PublicHasDynamicComputedPropertyC1xSivM : $@yield_once @convention(method) (@guaranteed PublicHasDynamicComputedProperty) -> @yields @inout Int
+// RESILIENT-LABEL: sil shared [serialized] @$S11modify_objc32PublicHasDynamicComputedPropertyC1xSivM : $@yield_once @convention(method) (@guaranteed PublicHasDynamicComputedProperty) -> @yields @inout Int
+
+
+// ... even if the class inherits NSObject.
+public class NSPublicHasDynamicStoredProperty : NSObject, ProtocolWithIntProperty {
+  @objc public dynamic var x: Int = 0
+}
+
+// CHECK-LABEL: sil shared [serialized] @$S11modify_objc32NSPublicHasDynamicStoredPropertyC1xSivM : $@yield_once @convention(method) (@guaranteed NSPublicHasDynamicStoredProperty) -> @yields @inout Int
+// RESILIENT-LABEL: sil shared [serialized] @$S11modify_objc32NSPublicHasDynamicStoredPropertyC1xSivM : $@yield_once @convention(method) (@guaranteed NSPublicHasDynamicStoredProperty) -> @yields @inout Int
+
+public class NSPublicHasDynamicComputedProperty : NSObject, ProtocolWithIntProperty {
+  @objc public dynamic var x: Int { get { } set { } }
+}
+
+// CHECK-LABEL: sil shared [serialized] @$S11modify_objc34NSPublicHasDynamicComputedPropertyC1xSivM : $@yield_once @convention(method) (@guaranteed NSPublicHasDynamicComputedProperty) -> @yields @inout Int
+// RESILIENT-LABEL: sil shared [serialized] @$S11modify_objc34NSPublicHasDynamicComputedPropertyC1xSivM : $@yield_once @convention(method) (@guaranteed NSPublicHasDynamicComputedProperty) -> @yields @inout Int