[Typechecker] Supress _modify synthesis if the wrapped property has observers

Author: theblixguy

lib/Sema/TypeCheckStorage.cpp

@@ -769,6 +769,11 @@ static Expr *buildStorageReference(AccessorDecl *accessor,
     auto var = dyn_cast<VarDecl>(decl);
     if (!var)
       return None;
+    bool hasObservers = var->getParsedAccessor(AccessorKind::WillSet) ||
+                        var->getParsedAccessor(AccessorKind::DidSet);
+    if (accessor->isCoroutine() && hasObservers) {
+      return None;
+    }
     auto mut = var->getPropertyWrapperMutability();
     if (!mut)
       return None;
@@ -1668,15 +1673,19 @@ synthesizeCoroutineAccessorBody(AccessorDecl *accessor, ASTContext &ctx) {
                    ? TargetImpl::Ordinary
                    : TargetImpl::Implementation);
 
+  bool hasObservers = storage->getParsedAccessor(AccessorKind::DidSet) ||
+                      storage->getParsedAccessor(AccessorKind::WillSet);
+
   // If this is a variable with an attached property wrapper, then
   // the accessors need to yield the wrappedValue or projectedValue.
   if (auto var = dyn_cast<VarDecl>(storage)) {
-    if (var->hasAttachedPropertyWrapper()) {
+    if (var->hasAttachedPropertyWrapper() && !hasObservers) {
       target = TargetImpl::Wrapper;
     }
 
     if (var->getOriginalWrappedProperty(
-            PropertyWrapperSynthesizedPropertyKind::StorageWrapper)) {
+            PropertyWrapperSynthesizedPropertyKind::StorageWrapper) &&
+        !hasObservers) {
       target = TargetImpl::WrapperStorage;
     }
   }