[Sema] Inncrease the score a bit higher for argument mismatch and updating tests

Author: LucianoPAlmeida

lib/Sema/CSSimplify.cpp

@@ -9824,9 +9824,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyFixConstraint(
   }
 
   case FixKind::AllowArgumentTypeMismatch: {
-    increaseScore(SK_Fix);
-    
-    auto impact = 1;
+    auto impact = 2;
     // If there are any other argument mismatches already detected for this
     // call, we increase the score even higher so more argument fixes means
     // less viable is the overload.
@@ -9836,7 +9834,7 @@ ConstraintSystem::SolutionKind ConstraintSystem::simplifyFixConstraint(
                      ? fixLocator->getAnchor() == locator.getAnchor()
                      : false;
         }))
-      impact = 2;
+      impact += 3;
 
     return recordFix(fix, impact) ? SolutionKind::Error : SolutionKind::Solved;
   }

test/Constraints/diagnostics.swift

@@ -1101,14 +1101,16 @@ func rdar17170728() {
     // expected-error@-1 4 {{optional type 'Int?' cannot be used as a boolean; test for '!= nil' instead}}
   }
 
+  // expected-error@+4 {{value of optional type 'Int?' must be unwrapped to a value of type 'Int'}}
+  // expected-error@+3 {{missing argument label 'into:' in call}}
+  // expected-note@+2 {{coalesce using '??' to provide a default when the optional value contains 'nil'}}
+  // expected-note@+1 {{force-unwrap using '!' to abort execution if the optional value contains 'nil'}}
   let _ = [i, j, k].reduce(0 as Int?) {
-    // expected-error@-1 3 {{cannot convert value of type 'Int?' to expected element type 'Int'}}
+    // expected-error@-1 3 {{cannot convert value of type 'Int?' to expected element type 'Bool'}}
     $0 && $1 ? $0 + $1 : ($0 ? $0 : ($1 ? $1 : nil))
     // expected-error@-1 2 {{type 'Int' cannot be used as a boolean; test for '!= 0' instead}}
-    // expected-error@-2   {{value of optional type 'Int?' must be unwrapped to a value of type 'Int'}}
-    // expected-error@-3 2 {{optional type 'Int?' cannot be used as a boolean; test for '!= nil' instead}}
-    // expected-note@-4:16 {{coalesce using '??' to provide a default when the optional value contains 'nil'}}
-    // expected-note@-5:16 {{force-unwrap using '!' to abort execution if the optional value contains 'nil'}}
+    // expected-error@-2 {{cannot convert value of type 'Bool' to expected argument type 'Int'}}
+    // expected-error@-3 {{result values in '? :' expression have mismatching types 'Bool' and 'Int?'}}
   }
 }
 

test/Parse/type_expr.swift

@@ -266,7 +266,6 @@ protocol P3 {}
 func compositionType() {
   _ = P1 & P2 // expected-error {{expected member name or constructor call after type name}} expected-note{{use '.self'}} {{7-7=(}} {{14-14=).self}}
   _ = P1 & P2.self // expected-error {{binary operator '&' cannot be applied to operands of type 'P1.Protocol' and 'P2.Protocol'}}
-  // expected-note@-1 {{overloads for '&' exist with these partially matching parameter lists: (Int, Int), (Int16, Int16), (Int32, Int32), (Int64, Int64), (Int8, Int8), (UInt, UInt), (UInt16, UInt16), (UInt32, UInt32), (UInt64, UInt64), (UInt8, UInt8)}}
   _ = (P1 & P2).self // Ok.
   _ = (P1 & (P2)).self // FIXME: OK? while `typealias P = P1 & (P2)` is rejected.
   _ = (P1 & (P2, P3)).self // expected-error {{non-protocol, non-class type '(P2, P3)' cannot be used within a protocol-constrained type}}