[test] Adjusting test cases for ambiguos candidates

Author: LucianoPAlmeida

lib/Sema/ConstraintSystem.cpp

@@ -3009,13 +3009,14 @@ bool ConstraintSystem::diagnoseAmbiguityWithFixes(
     }
   }
 
+  // If any of the non-overloaded common fixes appear in all solutions
+  // and can be diagnosed by the diagnoseForAmbiguity implementation,
+  // we diagnose and be done.
   if (diagnosed)
     return true;
 
-  // If all non-overloaded common fixes do not appear in all solutions
-  // nor are diagnosed for ambiguity, let's try to fall back to common
-  // anchor diagnostic.
-
+  // Otherwise let's try to fall back to overload common anchor
+  // diagnostic if possible.
   if (ambiguosOverloads.empty())
     return false;
 

test/Constraints/diagnostics.swift

@@ -496,10 +496,8 @@ enum Color {
 
   static func rainbow() -> Color {}
 
-  static func overload(a : Int) -> Color {} // expected-note {{incorrect labels for candidate (have: '(_:)', expected: '(a:)')}}
-  // expected-note@-1 {{candidate has partially matching parameter list (a: Int)}}
-  static func overload(b : Int) -> Color {} // expected-note {{incorrect labels for candidate (have: '(_:)', expected: '(b:)')}}
-  // expected-note@-1 {{candidate has partially matching parameter list (b: Int)}}
+  static func overload(a : Int) -> Color {} // expected-note 2 {{incorrect labels for candidate (have: '(_:)', expected: '(a:)')}}
+  static func overload(b : Int) -> Color {} // expected-note 2 {{incorrect labels for candidate (have: '(_:)', expected: '(b:)')}}
 
   static func frob(_ a : Int, b : inout Int) -> Color {}
   static var svar: Color { return .Red }

test/Constraints/super_constructor.swift

@@ -39,15 +39,15 @@ class B {
   init() {
   }
 
-  init(x:Int) { // expected-note{{candidate has partially matching parameter list (x: Int)}}
+  init(x:Int) { // expected-note{{incorrect labels for candidate (have: '(_:)', expected: '(x:)')}}
   }
 
-  init(a:UnicodeScalar) { // expected-note {{candidate has partially matching parameter list (a: UnicodeScalar)}}
+  init(a:UnicodeScalar) { // expected-note {{incorrect labels for candidate (have: '(_:)', expected: '(a:)')}}
   }
-  init(b:UnicodeScalar) { // expected-note{{candidate has partially matching parameter list (b: UnicodeScalar)}}
+  init(b:UnicodeScalar) { // expected-note{{incorrect labels for candidate (have: '(_:)', expected: '(b:)')}}
   }
 
-  init(z:Float) { // expected-note{{candidate has partially matching parameter list (z: Float)}}
+  init(z:Float) { // expected-note {{incorrect labels for candidate (have: '(_:)', expected: '(z:)')}}
     super.init() // expected-error{{'super' members cannot be referenced in a root class}}
   }
 }

test/expr/postfix/dot/init_ref_delegation.swift

@@ -323,12 +323,12 @@ class TestOverloadSets {
     self.init(5, 5) // expected-error{{extra argument in call}}
   }
 
-  convenience init(a : Z0) { // expected-note{{candidate has partially matching parameter list (a: Z0)}}
+  convenience init(a : Z0) { // expected-note{{incorrect labels for candidate (have: '(_:)', expected: '(a:)')}}
     self.init(42 as Int8) // expected-error{{no exact matches in call to initializer}}
   }
 
-  init(value: Int) { /* ... */ } // expected-note{{candidate has partially matching parameter list (value: Int)}}
-  init(value: Double) { /* ... */ } // expected-note{{candidate has partially matching parameter list (value: Double)}}
+  init(value: Int) { /* ... */ } // expected-note{{incorrect labels for candidate (have: '(_:)', expected: '(value:)')}}
+  init(value: Double) { /* ... */ } // expected-note{{incorrect labels for candidate (have: '(_:)', expected: '(value:)')}}
 }
 
 class TestNestedExpr {