[Sema] Minor adjusting on RemoveExtraneousArguments record logic

Author: LucianoPAlmeida

lib/Sema/CSSimplify.cpp

@@ -4353,15 +4353,14 @@ bool ConstraintSystem::repairFailures(
         if (rhs->is<TupleType>() && closureAnchor &&
             closureAnchor->getParameters()->size() > 1) {
           auto callee = getCalleeLocator(loc);
-          auto overload = findSelectedOverloadFor(callee);
-          if (overload) {
-            auto fnType = overload->openedType->getAs<FunctionType>();
+          if (auto overload = findSelectedOverloadFor(callee)) {
+            auto fnType =
+                simplifyType(overload->openedType)->castTo<FunctionType>();
             auto paramIdx = argToParamElt->getParamIdx();
-            if (auto paramType = fnType->getParams()[paramIdx]
-                                     .getOldType()
-                                     ->getAs<FunctionType>()) {
-              conversionsOrFixes.push_back(
-                  RemoveExtraneousArguments::create(*this, paramType, {}, loc));
+            auto paramType = fnType->getParams()[paramIdx].getParameterType();
+            if (auto paramFnType = paramType->getAs<FunctionType>()) {
+              conversionsOrFixes.push_back(RemoveExtraneousArguments::create(
+                  *this, paramFnType, {}, loc));
               break;
             }
           }

test/Constraints/closures.swift

@@ -1100,8 +1100,8 @@ struct R_76250381<Result, Failure: Error> {
 
 // SR-13483
 (0..<10).map { x, y in } 
-// expected-error@-1 {{contextual closure type '((Range<Int>).Element) throws -> ()' expects 1 argument, but 2 were used in closure body}}
+// expected-error@-1 {{contextual closure type '(Range<Int>.Element) throws -> ()' (aka '(Int) throws -> ()') expects 1 argument, but 2 were used in closure body}}
 (0..<10).map { x, y, z in } 
-// expected-error@-1 {{contextual closure type '((Range<Int>).Element) throws -> ()' expects 1 argument, but 3 were used in closure body}}
+// expected-error@-1 {{contextual closure type '(Range<Int>.Element) throws -> ()' (aka '(Int) throws -> ()') expects 1 argument, but 3 were used in closure body}}
 (0..<10).map { x, y, z, w in } 
-// expected-error@-1 {{contextual closure type '((Range<Int>).Element) throws -> ()' expects 1 argument, but 4 were used in closure body}}
+// expected-error@-1 {{contextual closure type '(Range<Int>.Element) throws -> ()' (aka '(Int) throws -> ()') expects 1 argument, but 4 were used in closure body}}