[Sema][SR-15179] Do not record default argument mismatch fix if there is one remove arg fix already for locator

Author: LucianoPAlmeida

lib/Sema/CSSimplify.cpp

@@ -4410,6 +4410,11 @@ bool ConstraintSystem::repairFailures(
                                                   loc))
       return true;
 
+    // There is already a remove extraneous arguments fix recorded for this
+    // apply arg to param locator, so let's skip the default argument mismatch.
+    if (hasFixFor(loc, FixKind::RemoveExtraneousArguments))
+      return true;
+
     conversionsOrFixes.push_back(
         AllowArgumentMismatch::create(*this, lhs, rhs, loc));
     break;
@@ -4505,12 +4510,9 @@ bool ConstraintSystem::repairFailures(
       // a single parameter of the function type involved in a conversion
       // to another function type, see `matchFunctionTypes`. If there is already
       // a fix for the this convertion, we can just ignore individual function
-      // argument in-out mismatch failure by considered this fixed increasing
-      // the score.
-      if (hasFixFor(parentLoc)) {
-        increaseScore(SK_Fix);
+      // argument in-out mismatch failure by considered this fixed.
+      if (hasFixFor(parentLoc))
         return true;
-      }
 
       // We want to call matchTypes with the default decomposition options
       // in case there are type variables that we couldn't bind due to the

test/Concurrency/isolated_parameters.swift

@@ -107,8 +107,7 @@ func tuplify<Ts>(_ fn: (Ts) -> Void) {} // expected-note {{in call to function '
 
 @available(SwiftStdlib 5.5, *)
 func testTuplingIsolated(_ a: isolated A, _ b: isolated A) {
-  // FIXME: We shouldn't duplicate the "cannot convert value of type" diagnostic (SR-15179)
   tuplify(testTuplingIsolated)
   // expected-error@-1 {{generic parameter 'Ts' could not be inferred}}
-  // expected-error@-2 2{{cannot convert value of type '(isolated A, isolated A) -> ()' to expected argument type '(Ts) -> Void'}}
+  // expected-error@-2 {{cannot convert value of type '(isolated A, isolated A) -> ()' to expected argument type '(Ts) -> Void'}}
 }

test/Constraints/function.swift

@@ -265,6 +265,10 @@ func testInvalidTupleImplosions() {
 }
 
 // SR-15179 
-func SR15179<Ts>(_ fn: @escaping (Ts) -> Void) {}
+func SR15179<Ts>(_ fn: @escaping (Ts) -> Void) {} // expected-note {{in call to function 'SR15179'}}
+func fn1(x: Int..., y: Int...) {}
+SR15179(fn1) // expected-error {{cannot convert value of type '(Int..., Int...) -> ()' to expected argument type '(Ts) -> Void'}}
+// expected-error@-1{{generic parameter 'Ts' could not be inferred}}
+
 func fn(_ x: inout Int, _ y: inout Int) {}
-SR15179(fn) // expected-error{{cannot convert value of type '(inout Int, inout Int) -> ()' to expected argument type '(Int) -> Void'}}
+SR15179(fn) // expected-error {{cannot convert value of type '(inout Int, inout Int) -> ()' to expected argument type '(Int) -> Void'}}