Merge pull request #63031 from xedin/diag-inaccessible-member-in-ambiguous-context

[CSFix] Diagnose use of inaccessible members in ambiguous contexts

Author: xedin

include/swift/Sema/CSFix.h

@@ -1851,6 +1851,10 @@ class AllowInaccessibleMember final : public AllowInvalidMemberRef {
 
   bool diagnose(const Solution &solution, bool asNote = false) const override;
 
+  bool diagnoseForAmbiguity(CommonFixesArray commonFixes) const override {
+    return diagnose(*commonFixes.front().first);
+  }
+
   static AllowInaccessibleMember *create(ConstraintSystem &cs, Type baseType,
                                          ValueDecl *member, DeclNameRef name,
                                          ConstraintLocator *locator);

test/Constraints/members.swift

@@ -783,3 +783,14 @@ func rdar92358570(_ x: RDAR92358570<ClassBoundProtocol>, _ y: RDAR92358570<SomeC
   y.doSomething() // expected-error {{referencing instance method 'doSomething()' on 'RDAR92358570' requires that 'any SomeClassBound & ClassBoundProtocol' inherit from 'AnyObject'}}
   RDAR92358570<SomeClassBound & ClassBoundProtocol>.doSomethingStatically() // expected-error {{referencing static method 'doSomethingStatically()' on 'RDAR92358570' requires that 'any SomeClassBound & ClassBoundProtocol' inherit from 'AnyObject'}}
 }
+
+func test_diagnose_inaccessible_member_in_ambiguous_context() {
+  struct S {
+    private var x: Int // expected-note {{'x' declared here}}
+  }
+
+  func test<T>(_: KeyPath<S, T>, y: Int = 42) {}
+  func test<T>(_: KeyPath<S, T>, x: Int = 42) {}
+
+  test(\.x) // expected-error {{'x' is inaccessible due to 'private' protection level}}
+}