Merge pull request #60134 from xedin/rdar-88513939-5.7

[5.7][CSSimplify] Allow referencing typealias declarations via leading-dot…

Author: xedin

lib/Sema/CSSimplify.cpp

@@ -7421,6 +7421,12 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyConformsToConstraint(
       }
     }
 
+    if (loc->isLastElement<LocatorPathElt::MemberRefBase>()) {
+      auto *fix = ContextualMismatch::create(*this, protocolTy, type, loc);
+      if (!recordFix(fix))
+        return SolutionKind::Solved;
+    }
+
     // If this is an implicit Hashable conformance check generated for each
     // index argument of the keypath subscript component, we could just treat
     // it as though it conforms.
@@ -9802,7 +9808,7 @@ ConstraintSystem::simplifyUnresolvedMemberChainBaseConstraint(
       return SolutionKind::Solved;
 
     auto *memberRef = findResolvedMemberRef(memberLoc);
-    if (memberRef && memberRef->isStatic()) {
+    if (memberRef && (memberRef->isStatic() || isa<TypeAliasDecl>(memberRef))) {
       return simplifyConformsToConstraint(
           resultTy, baseTy, ConstraintKind::ConformsTo,
           getConstraintLocator(memberLoc, ConstraintLocator::MemberRefBase),

test/Constraints/static_members_on_protocol_in_generic_context.swift

@@ -325,3 +325,28 @@ func acceptStyle<S: Style>(_: S) {}
 
 acceptStyle(.formattedString(format: "hi")) // Ok
 acceptStyle(.number(42)) // Ok
+
+protocol Container {
+  associatedtype Content
+}
+
+struct Box<T>: Container { // expected-note {{'T' declared as parameter to type 'Box'}}
+  typealias Content = T
+  init(_: Content) {}
+}
+
+extension Container {
+  // leading-dot syntax is going to use a typealias
+  typealias box = Box
+}
+
+// rdar://88513939 - Allow to call init through a typealias using leading-dot syntax in generic context
+func test_leading_dot_syntax_with_typelias() {
+  func test<T: Container>(_: T) {} // expected-note {{required by local function 'test' where 'T' = 'Box<T>.Type'}}
+
+  test(Container.box(1)) // Ok
+  test(.box(1)) // Ok `Container.box(1)` means `Box.init(1)`
+
+  test(.box) // expected-error {{type 'Box<T>.Type' cannot conform to 'Container'}} expected-note {{only concrete types such as structs, enums and classes can conform to protocols}}
+  // expected-error@-1 {{generic parameter 'T' could not be inferred}}
+}