[Sema] Improves diagnostic when passing an argument as property of an…

… optional class instance (swiftlang#57437)
Rajveer100 · Sep 11, 2023 · a5e35fa · a5e35fa
1 parent a5607cc
commit a5e35fa
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 2 deletions.
diff --git a/lib/Sema/CSSimplify.cpp b/lib/Sema/CSSimplify.cpp
@@ -6465,6 +6465,15 @@ bool ConstraintSystem::repairFailures(
     // diagnostics.
     if (flags.contains(TMF_MatchingGenericArguments))
       break;
+
+    if (!path.empty()) {
+      if (path.back().is<LocatorPathElt::ApplyArgToParam>())
+        conversionsOrFixes.push_back(AllowArgumentMismatch::create(
+            *this, lhs, rhs, getConstraintLocator(anchor, path)));
+      else if (path.back().is<LocatorPathElt::ContextualType>())
+        conversionsOrFixes.push_back(IgnoreContextualType::create(
+            *this, lhs, rhs, getConstraintLocator(anchor, path)));
+    }
 
     Type fromType;
     Type toType;

diff --git a/test/Constraints/parameterized_existentials.swift b/test/Constraints/parameterized_existentials.swift
@@ -36,13 +36,13 @@ func g3(x: G<any P<Int>>) -> G<any P<String>> {
 }
 
 func h1(x: (any P)?) -> (any P<Int>)? {
-  return x // expected-error {{cannot convert return expression of type '(any P)?' to return type '(any P<Int>)?'}}
+  return x // expected-error {{cannot convert return expression of type 'any P' to return type 'any P<Int>'}}
 }
 
 func h2(x: (any P<Int>)?) -> (any P)? {
   return x // okay
 }
 
 func h3(x: (any P<Int>)?) -> (any P<String>)? {
-  return x // expected-error {{cannot convert return expression of type '(any P<Int>)?' to return type '(any P<String>)?'}}
+  return x // expected-error {{cannot convert return expression of type 'String' to return type 'Int'}}
 }