Merge pull request #31434 from slavapestov/dynamic-stored-property-with-observers-fix-5.3

Sema: Fix crash with stored property that has on-demand 'modify' accessor [5.3]

Author: slavapestov

lib/Sema/TypeCheckStorage.cpp

@@ -1764,9 +1764,16 @@ synthesizeCoroutineAccessorBody(AccessorDecl *accessor, ASTContext &ctx) {
 
   bool isModify = accessor->getAccessorKind() == AccessorKind::Modify;
 
+  // Special-case for a modify coroutine of a simple stored property with
+  // observers. We can yield a borrowed copy of the underlying storage
+  // in this case. However, if the accessor was synthesized on-demand,
+  // we do the more general thing, because on-demand accessors might be
+  // serialized, which prevents them from being able to directly reference
+  // didSet/willSet accessors, which are private.
   if (isModify &&
       (storageReadWriteImpl == ReadWriteImplKind::StoredWithSimpleDidSet ||
-       storageReadWriteImpl == ReadWriteImplKind::InheritedWithSimpleDidSet)) {
+       storageReadWriteImpl == ReadWriteImplKind::InheritedWithSimpleDidSet) &&
+      !accessor->hasForcedStaticDispatch()) {
     return synthesizeModifyCoroutineBodyWithSimpleDidSet(accessor, ctx);
   }
 

test/SILGen/observers_with_on_demand_modify_accessor.swift

@@ -0,0 +1,17 @@
+// RUN: %target-swift-emit-silgen %s -disable-objc-attr-requires-foundation-module | %FileCheck %s
+// REQUIRES: objc_interop
+
+public protocol Proto {
+  var property: Int { get set }
+}
+
+public class ClassWithDynamicObservedProperty : Proto {
+  @objc public dynamic var property: Int = 0 {
+    didSet {}
+  }
+}
+
+// CHECK-LABEL: sil shared [serialized] [ossa] @$s40observers_with_on_demand_modify_accessor32ClassWithDynamicObservedPropertyC8propertySivM : $@yield_once @convention(method) (@guaranteed ClassWithDynamicObservedProperty) -> @yields @inout Int {
+// CHECK: objc_method %0 : $ClassWithDynamicObservedProperty, #ClassWithDynamicObservedProperty.property!getter.foreign
+// CHECK: objc_method %0 : $ClassWithDynamicObservedProperty, #ClassWithDynamicObservedProperty.property!setter.foreign
+// CHECK: return