Merge pull request #27995 from theblixguy/fix/SR-11684

[PropertyWrappers] Mark the property as invalid when there is a mismatch with wrappedValue type

Author: theblixguy

lib/Sema/CSSimplify.cpp

@@ -2980,6 +2980,16 @@ bool ConstraintSystem::repairFailures(
                        locator);
     }
 
+    // Let's not complain about argument type mismatch if we have a synthesized
+    // wrappedValue initializer, because we already emit a diagnostic for a
+    // type mismatch between the property's type and the wrappedValue type.
+    if (auto CE = dyn_cast<CallExpr>(loc->getAnchor())) {
+      if (CE->isImplicit() && !CE->getArgumentLabels().empty() &&
+          CE->getArgumentLabels().front() == getASTContext().Id_wrappedValue) {
+        break;
+      }
+    }
+
     conversionsOrFixes.push_back(
         AllowArgumentMismatch::create(*this, lhs, rhs, loc));
     break;

lib/Sema/TypeCheckPropertyWrapper.cpp

@@ -594,6 +594,7 @@ PropertyWrapperBackingPropertyTypeRequest::evaluate(
   if (cs.solve(nullptr, solutions) || solutions.size() != 1) {
     var->diagnose(diag::property_wrapper_incompatible_property,
                   propertyType, rawType);
+    var->setInvalid();
     if (auto nominalWrapper = rawType->getAnyNominal()) {
       nominalWrapper->diagnose(diag::property_wrapper_declared_here,
                                nominalWrapper->getFullName());

lib/Sema/TypeCheckStorage.cpp

@@ -2344,6 +2344,7 @@ PropertyWrapperBackingPropertyInfoRequest::evaluate(Evaluator &evaluator,
         !propertyType->isEqual(expectedPropertyType)) {
       var->diagnose(diag::property_wrapper_incompatible_property,
                     propertyType, wrapperType);
+      var->setInvalid();
       if (auto nominalWrapper = wrapperType->getAnyNominal()) {
         nominalWrapper->diagnose(diag::property_wrapper_declared_here,
                                  nominalWrapper->getFullName());

test/decl/var/property_wrappers.swift

@@ -244,10 +244,8 @@ struct Initialization {
   @WrapperWithInitialValue
   var y = true
 
-  // FIXME: For some reason this is type-checked twice, second time around solver complains about <<error type>> argument
   @WrapperWithInitialValue<Int>
-  var y2 = true // expected-error{{cannot convert value of type 'Bool' to expected argument type 'Int'}}
-  // expected-error@-1 {{cannot convert value of type '<<error type>>' to expected argument type 'Int'}}
+  var y2 = true // expected-error{{Bool' is not convertible to 'Int}}
 
   mutating func checkTypes(s: String) {
     x2 = s // expected-error{{cannot assign value of type 'String' to type 'Double'}}
@@ -1584,9 +1582,7 @@ extension SR_11288_P4 where Self: AnyObject { // expected-note 2 {{where 'Self'
 }
 
 struct SR_11288_S4: SR_11288_P4 {
-  // FIXME: We shouldn't diagnose the arg-to-param mismatch (rdar://problem/56345248)
   @SR_11288_Wrapper4 var answer = 42 // expected-error 2 {{referencing type alias 'SR_11288_Wrapper4' on 'SR_11288_P4' requires that 'SR_11288_S4' be a class type}}
-  // expected-error @-1 {{cannot convert value of type '<<error type>>' to expected argument type 'Int'}}
 }
 
 class SR_11288_C0: SR_11288_P4 {

validation-test/compiler_crashers_2_fixed/sr11600.swift

@@ -0,0 +1,13 @@
+// RUN: not %target-swift-frontend -typecheck %s
+
+@propertyWrapper struct A {
+  var wrappedValue: Int
+}
+
+@propertyWrapper struct B {
+  var wrappedValue: Int
+}
+
+struct C {
+  @A @B var foo: Int?
+}

validation-test/compiler_crashers_2_fixed/sr11684.swift

@@ -0,0 +1,21 @@
+// RUN: %target-swift-frontend %s -typecheck -verify
+
+@propertyWrapper 
+struct Wrapper1 { // expected-note {{property wrapper type 'Wrapper1' declared here}}
+  var wrappedValue: Int?
+}
+
+class Test1 {
+  @Wrapper1 var user: Int 
+  // expected-error@-1 {{property type 'Int' does not match that of the 'wrappedValue' property of its wrapper type 'Wrapper1'}}
+}
+
+@propertyWrapper 
+struct Wrapper2 { // expected-note {{property wrapper type 'Wrapper2' declared here}}
+  var wrappedValue: Int??
+}
+
+class Test2 {
+  @Wrapper2 var user: Int? 
+  // expected-error@-1 {{property type 'Int?' does not match that of the 'wrappedValue' property of its wrapper type 'Wrapper2'}}
+}