Merge pull request #31443 from hborla/property-wrapper-optional-dynamic-self

[Property Wrappers] Fix disallowing dynamic Self for property wrapper wrappedValue/projectedValue to also cover optional.

Author: hborla

lib/Sema/TypeCheckPropertyWrapper.cpp

@@ -406,25 +406,21 @@ PropertyWrapperTypeInfoRequest::evaluate(
     }
   }
 
-  auto diagnoseInvalidDynamicSelf = [&]() -> bool {
-    bool invalidDynamicSelf = false;
-    if (result.projectedValueVar &&
-        result.projectedValueVar->getValueInterfaceType()->is<DynamicSelfType>()) {
-      result.projectedValueVar->diagnose(
-          diag::property_wrapper_dynamic_self_type, /*projectedValue=*/true);
-      invalidDynamicSelf = true;
-    }
-
-    if (result.valueVar->getValueInterfaceType()->is<DynamicSelfType>()) {
-      result.valueVar->diagnose(
-          diag::property_wrapper_dynamic_self_type, /*projectedValue=*/false);
-      invalidDynamicSelf = true;
-    }
+  bool hasInvalidDynamicSelf = false;
+  if (result.projectedValueVar &&
+      result.projectedValueVar->getValueInterfaceType()->hasDynamicSelfType()) {
+    result.projectedValueVar->diagnose(
+        diag::property_wrapper_dynamic_self_type, /*projectedValue=*/true);
+    hasInvalidDynamicSelf = true;
+  }
 
-    return invalidDynamicSelf;
-  };
+  if (result.valueVar->getValueInterfaceType()->hasDynamicSelfType()) {
+    result.valueVar->diagnose(
+        diag::property_wrapper_dynamic_self_type, /*projectedValue=*/false);
+    hasInvalidDynamicSelf = true;
+  }
 
-  if (diagnoseInvalidDynamicSelf())
+  if (hasInvalidDynamicSelf)
     return PropertyWrapperTypeInfo();
 
   return result;

test/decl/var/property_wrappers.swift

@@ -833,7 +833,7 @@ struct DynamicSelfStruct {
 @propertyWrapper
 class DynamicSelf {
   var wrappedValue: Self { self } // expected-error {{property wrapper wrapped value cannot have dynamic Self type}}
-  var projectedValue: Self { self } // expected-error {{property wrapper projected value cannot have dynamic Self type}}
+  var projectedValue: Self? { self } // expected-error {{property wrapper projected value cannot have dynamic Self type}}
 }
 
 struct UseDynamicSelfWrapper {