Merge pull request #36300 from xedin/overload-filter-for-members

[ConstraintSystem] Use correct locator when filtering disjunction cho…

Author: xedin

lib/Sema/CSSimplify.cpp

@@ -9373,7 +9373,7 @@ bool ConstraintSystem::simplifyAppliedOverloads(
   AppliedDisjunctions[disjunction->getLocator()] = argFnType;
   return simplifyAppliedOverloadsImpl(disjunction, fnTypeVar, argFnType,
                                       /*numOptionalUnwraps*/ result->second,
-                                      locator);
+                                      applicableFn->getLocator());
 }
 
 bool ConstraintSystem::simplifyAppliedOverloads(

test/Constraints/overload_filtering.swift

@@ -38,3 +38,25 @@ func testUnresolvedMember(i: Int) -> X {
   // CHECK-NEXT: introducing single enabled disjunction term {{.*}} bound to decl overload_filtering.(file).X.init(_:_:)
   return .init(i, i)
 }
+
+func test_member_filtering() {
+  struct S {
+    // Result types here are different intentionally,
+    // if there were the same simplication logic would
+    // trigger and disable overloads during constraint
+    // generation.
+    func foo(_: Int) -> S { S() }
+    func foo(_: String) -> Int { 42 }
+
+    func bar(v: String) {}
+    func bar(_: Int) {}
+    func bar(a: Double, b: Int) {}
+  }
+
+  func test(s: S) {
+    // CHECK: disabled disjunction term {{.*}} bound to decl overload_filtering.(file).test_member_filtering().S.bar(v:)
+    // CHECK-NEXT: disabled disjunction term {{.*}} bound to decl overload_filtering.(file).test_member_filtering().S.bar(a:b:)
+    // CHECK-NEXT: introducing single enabled disjunction term {{.*}} bound to decl overload_filtering.(file).test_member_filtering().S.bar
+    s.foo(42).bar(42)
+  }
+}