Merge pull request #25111 from xedin/diag-conditional-req-in-self-5.1

[5.1][ConstraintSystem] Deplay opening generic requirements until after co…

Author: xedin

lib/Sema/ConstraintSystem.cpp

@@ -606,7 +606,8 @@ Type ConstraintSystem::openFunctionType(
        OpenedTypeMap &replacements,
        DeclContext *innerDC,
        DeclContext *outerDC,
-       bool skipProtocolSelfConstraint) {
+       bool skipProtocolSelfConstraint,
+       bool skipGenericRequirements) {
   Type type;
 
   if (auto *genericFn = funcType->getAs<GenericFunctionType>()) {
@@ -616,7 +617,8 @@ Type ConstraintSystem::openFunctionType(
                 genericFn->getGenericSignature(),
                 skipProtocolSelfConstraint,
                 locator,
-                replacements);
+                replacements,
+                skipGenericRequirements);
 
     // Transform the parameters and output type.
     llvm::SmallVector<AnyFunctionType::Param, 4> openedParams;
@@ -1072,7 +1074,8 @@ void ConstraintSystem::openGeneric(
        GenericSignature *sig,
        bool skipProtocolSelfConstraint,
        ConstraintLocatorBuilder locator,
-       OpenedTypeMap &replacements) {
+       OpenedTypeMap &replacements,
+       bool skipGenericRequirements) {
   if (sig == nullptr)
     return;
 
@@ -1099,6 +1102,9 @@ void ConstraintSystem::openGeneric(
 
   bindArchetypesFromContext(*this, outerDC, locatorPtr, replacements);
 
+  if (skipGenericRequirements)
+    return;
+
   // Add the requirements as constraints.
   openGenericRequirements(
       outerDC, sig, skipProtocolSelfConstraint, locator,
@@ -1302,9 +1308,12 @@ ConstraintSystem::getTypeOfMemberReference(
     }
   }
 
+  // While opening member function type, let's delay opening requirements
+  // to allow contextual types to affect the situation.
   openedType = openFunctionType(funcType, numRemovedArgumentLabels,
                                 locator, replacements, innerDC, outerDC,
-                                /*skipProtocolSelfConstraint=*/true);
+                                /*skipProtocolSelfConstraint=*/true,
+                                /*skipGenericRequirements=*/true);
 
   if (!outerDC->getSelfProtocolDecl()) {
     // Class methods returning Self as well as constructors get the
@@ -1348,6 +1357,19 @@ ConstraintSystem::getTypeOfMemberReference(
     addSelfConstraint(*this, baseOpenedTy, selfObjTy, locator);
   }
 
+  // Open generic requirements after self constraint has been
+  // applied and contextual types have been propagated. This
+  // helps diagnostics because instead of self type conversion
+  // failing we'll get a generic requirement constraint failure
+  // if mismatch is related to generic parameters which is much
+  // easier to diagnose.
+  if (auto *genericFn = funcType->getAs<GenericFunctionType>()) {
+    openGenericRequirements(
+        outerDC, genericFn->getGenericSignature(),
+        /*skipProtocolSelfConstraint=*/true, locator,
+        [&](Type type) { return openType(type, replacements); });
+  }
+
   // Compute the type of the reference.
   Type type;
   if (!value->isInstanceMember() || isInstance) {

lib/Sema/ConstraintSystem.h

@@ -2325,6 +2325,9 @@ class ConstraintSystem {
   /// \param skipProtocolSelfConstraint Whether to skip the constraint on a
   /// protocol's 'Self' type.
   ///
+  /// \param skipGenericRequirements Whether to skip opening generic
+  /// requirements asscoiated with given function type.
+  ///
   /// \returns The opened type, or \c type if there are no archetypes in it.
   Type openFunctionType(
       AnyFunctionType *funcType,
@@ -2333,16 +2336,18 @@ class ConstraintSystem {
       OpenedTypeMap &replacements,
       DeclContext *innerDC,
       DeclContext *outerDC,
-      bool skipProtocolSelfConstraint);
+      bool skipProtocolSelfConstraint,
+      bool skipGenericRequirements = false);
 
-  /// Open the generic parameter list and its requirements, creating
-  /// type variables for each of the type parameters.
+  /// Open the generic parameter list and (if requested) its requirements,
+  /// creating type variables for each of the type parameters.
   void openGeneric(DeclContext *innerDC,
                    DeclContext *outerDC,
                    GenericSignature *signature,
                    bool skipProtocolSelfConstraint,
                    ConstraintLocatorBuilder locator,
-                   OpenedTypeMap &replacements);
+                   OpenedTypeMap &replacements,
+                   bool skipGenericRequirements = false);
 
   /// Given generic signature open its generic requirements,
   /// using substitution function, and record them in the

lib/Sema/TypeCheckProtocol.cpp

@@ -749,6 +749,14 @@ static Optional<RequirementMatch> findMissingGenericRequirementForSolutionFix(
   Type selfTy = proto->getSelfInterfaceType().subst(reqSubMap);
   if (type->isEqual(selfTy)) {
     type = conformance->getType();
+
+    // e.g. `extension P where Self == C { func foo() { ... } }`
+    // and `C` doesn't actually conform to `P`.
+    if (type->isEqual(missingType)) {
+      requirementKind = RequirementKind::Conformance;
+      missingType = proto->getDeclaredType();
+    }
+
     if (auto agt = type->getAs<AnyGenericType>())
       type = agt->getDecl()->getDeclaredInterfaceType();
     return missingRequirementMatch(type);

test/Constraints/members.swift

@@ -627,3 +627,30 @@ func rdar_50467583_and_50909555() {
     s[1] // expected-error {{static member 'subscript' cannot be used on instance of type 'S'}} {{5-6=S}}
   }
 }
+
+// SR-9396 (rdar://problem/46427500) - Nonsensical error message related to constrained extensions
+struct SR_9396<A, B> {}
+
+extension SR_9396 where A == Bool {  // expected-note {{where 'A' = 'Int'}}
+  func foo() {}
+}
+
+func test_sr_9396(_ s: SR_9396<Int, Double>) {
+  s.foo() // expected-error {{referencing instance method 'foo()' on 'SR_9396' requires the types 'Int' and 'Bool' be equivalent}}
+}
+
+// rdar://problem/34770265 - Better diagnostic needed for constrained extension method call
+extension Dictionary where Key == String { // expected-note {{where 'Key' = 'Int'}}
+  func rdar_34770265_key() {}
+}
+
+extension Dictionary where Value == String { // expected-note {{where 'Value' = 'Int'}}
+  func rdar_34770265_val() {}
+}
+
+func test_34770265(_ dict: [Int: Int]) {
+  dict.rdar_34770265_key()
+  // expected-error@-1 {{referencing instance method 'rdar_34770265_key()' on 'Dictionary' requires the types 'Int' and 'String' be equivalent}}
+  dict.rdar_34770265_val()
+  // expected-error@-1 {{referencing instance method 'rdar_34770265_val()' on 'Dictionary' requires the types 'Int' and 'String' be equivalent}}
+}

test/Serialization/extension-of-typealias.swift

@@ -41,7 +41,7 @@ func test(x: Int) {
   x.addedMember()
   [x].addedMember()
   [x].addedMemberInt()
-  ([] as [Bool]).addedMemberInt() // expected-error {{'[Bool]' is not convertible to 'Array<Int>'}}
+  ([] as [Bool]).addedMemberInt() // expected-error {{referencing instance method 'addedMemberInt()' on 'Array' requires the types 'Bool' and 'Int' be equivalent}}
 }
 
 #endif

test/decl/nested/type_in_type.swift

@@ -377,8 +377,8 @@ protocol ExpressibleByDogLiteral {}
 struct Kitten : ExpressibleByCatLiteral {}
 struct Puppy : ExpressibleByDogLiteral {}
 
-struct Claws<A: ExpressibleByCatLiteral> { // expected-note {{'A' declared as parameter to type 'Claws'}}
-  struct Fangs<B: ExpressibleByDogLiteral> { }
+struct Claws<A: ExpressibleByCatLiteral> {
+  struct Fangs<B: ExpressibleByDogLiteral> { } // expected-note {{where 'B' = 'NotADog'}}
 }
 
 struct NotADog {}
@@ -401,9 +401,8 @@ func test() {
   // expected-error@-1 {{cannot convert value of type 'Claws<_>.Fangs<_>' to specified type 'Claws.Fangs<Puppy>'}}
   let _: Claws.Fangs<NotADog> = something()
   // expected-error@-1 {{generic parameter 'T' could not be inferred}} // FIXME: bad diagnostic
-  _ = Claws.Fangs<NotADog>()
-  // expected-error@-1 {{generic parameter 'A' could not be inferred}}
-  // expected-note@-2 {{explicitly specify the generic arguments to fix this issue}}
+  _ = Claws.Fangs<NotADog>() // TODO(diagnostics): There should be two errors here - "cannot infer A" and "NotADog conformance to ExpressibleByDogLiteral"
+  // expected-error@-1 {{referencing initializer 'init()' on 'Claws.Fangs' requires that 'NotADog' conform to 'ExpressibleByDogLiteral'}}
 }
 
 // https://bugs.swift.org/browse/SR-4379

test/decl/protocol/conforms/self.swift

@@ -50,7 +50,7 @@ protocol HasDefault {
 
 extension HasDefault where Self == SillyClass {
   func foo() {}
-  // expected-note@-1 {{candidate has non-matching type '<Self> () -> ()'}}
+  // expected-note@-1 {{candidate would match if 'SillyClass' conformed to 'HasDefault'}}
 }
 
 extension SillyClass : HasDefault {}