Merge pull request #25353 from DougGregor/property-wrappers-consistency-sr-10899

Author: swift-ci

lib/Sema/CodeSynthesis.cpp

@@ -1756,13 +1756,34 @@ PropertyWrapperBackingPropertyInfoRequest::evaluate(Evaluator &evaluator,
   auto dc = var->getDeclContext();
   Type storageInterfaceType = wrapperType;
 
-  Type storageType =
-      var->getDeclContext()->mapTypeIntoContext(storageInterfaceType);
+  Type storageType = dc->mapTypeIntoContext(storageInterfaceType);
   if (!storageType) {
     storageType = ErrorType::get(ctx);
     isInvalid = true;
   }
 
+  // Make sure that the property type matches the value of the
+  // wrapper type.
+  if (!storageType->hasError()) {
+    Type expectedPropertyType =
+        storageType->getTypeOfMember(
+          dc->getParentModule(),
+          wrapperInfo.valueVar,
+          wrapperInfo.valueVar->getValueInterfaceType());
+    Type propertyType =
+        dc->mapTypeIntoContext(var->getValueInterfaceType());
+    if (!expectedPropertyType->hasError() &&
+        !propertyType->hasError() &&
+        !propertyType->isEqual(expectedPropertyType)) {
+      var->diagnose(diag::property_wrapper_incompatible_property,
+                    propertyType, wrapperType);
+      if (auto nominalWrapper = wrapperType->getAnyNominal()) {
+        nominalWrapper->diagnose(diag::property_wrapper_declared_here,
+                                 nominalWrapper->getFullName());
+      }
+    }
+  }
+
   // Create the backing storage property and note it in the cache.
   VarDecl *backingVar = new (ctx) VarDecl(/*IsStatic=*/var->isStatic(),
                                           VarDecl::Specifier::Var,

test/decl/var/property_wrappers.swift

@@ -758,3 +758,13 @@ struct UsesWrapperRequiringP {
   // expected-error@-2{{expected declaration}}
   // expected-error@-3{{type annotation missing in pattern}}
 }
+
+// SR-10899 / rdar://problem/51588022
+@_propertyWrapper
+struct SR_10899_Wrapper { // expected-note{{property wrapper type 'SR_10899_Wrapper' declared here}}
+  var value: String { "hi" }
+}
+
+struct SR_10899_Usage {
+  @SR_10899_Wrapper var thing: Bool // expected-error{{property type 'Bool' does not match that of the 'value' property of its wrapper type 'SR_10899_Wrapper'}}
+}