Merge pull request #29795 from vukrado/SR-11964-bad-diagnostic-mismatched-numeric-types

[CSSimplify] Increment impact for DefineMemberBasedOnUse when base type is any function type

Author: hborla

lib/Sema/CSSimplify.cpp

@@ -6322,6 +6322,13 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyMemberConstraint(
       // not a match in this case.
       auto impact =
           locator->findLast<LocatorPathElt::UnresolvedMember>() ? 2 : 1;
+
+      // Impact is higher if the the base type is any function type
+      // because function types can't have any members other than self
+      if (baseObjTy->is<AnyFunctionType>()) {
+          impact += 10;
+      }
+
       if (recordFix(fix, impact))
         return SolutionKind::Error;
 

test/Constraints/diagnostics.swift

@@ -1385,3 +1385,23 @@ class ClassWithPropContainingSetter {
     set { return 1 } // expected-error {{unexpected non-void return value in void function}}
   }
 }
+
+// https://bugs.swift.org/browse/SR-11964
+struct Rect {
+    let width: Int
+    let height: Int
+}
+
+struct Frame {
+    func rect(width: Int, height: Int) -> Rect {
+        Rect(width: width, height: height)
+    }
+
+    let rect: Rect
+}
+
+func foo(frame: Frame) {
+    frame.rect.width + 10.0 // expected-error {{binary operator '+' cannot be applied to operands of type 'Int' and 'Double'}}
+    // expected-note@-1 {{overloads for '+' exist with these partially matching parameter lists: (Double, Double), (Int, Int)}}
+
+}