Merge pull request #41830 from LucianoPAlmeida/SR-15970-optional-conformance

[Diagnostic][Sema] Drop OptionalPayload locator element in contextual conformance failure diagnostics

Author: LucianoPAlmeida

lib/Sema/CSSimplify.cpp

@@ -3407,7 +3407,7 @@ ConstraintSystem::matchExistentialTypes(Type type1, Type type2,
 
           if (last.is<LocatorPathElt::ApplyArgToParam>()) {
             auto *fix = AllowArgumentMismatch::create(
-                *this, type1, proto, getConstraintLocator(locator));
+                *this, type1, proto, getConstraintLocator(anchor, path));
 
             // Impact is 2 here because there are two failures
             // 1 - missing conformance and 2 - incorrect argument type.
@@ -3443,14 +3443,14 @@ ConstraintSystem::matchExistentialTypes(Type type1, Type type2,
 
         if (isExpr<CoerceExpr>(anchor)) {
           auto *fix = ContextualMismatch::create(
-              *this, type1, type2, getConstraintLocator(locator));
+              *this, type1, type2, getConstraintLocator(anchor, path));
           if (recordFix(fix))
             return getTypeMatchFailure(locator);
           break;
         }
 
         auto *fix = MissingConformance::forContextual(
-            *this, type1, proto, getConstraintLocator(locator));
+            *this, type1, proto, getConstraintLocator(anchor, path));
 
         if (recordFix(fix))
           return getTypeMatchFailure(locator);

test/Constraints/protocols.swift

@@ -519,3 +519,15 @@ case test(cond: Bool, v: Int64)
     }
   }
 }
+
+// SR-15970
+protocol SR15970_P {}
+struct SR15970_S {}
+
+func SR15970_F(x: Int) -> SR15970_P {
+  return SR15970_S() // expected-error{{return expression of type 'SR15970_S' does not conform to 'SR15970_P'}}
+}
+
+func SR15970_F1(x: Int) -> SR15970_P? {
+  return SR15970_S() // expected-error{{return expression of type 'SR15970_S' does not conform to 'SR15970_P'}}
+}