Start using contextual information from function calls to diagnose issues in their

argument.  For now we start with some of the most simple cases: single argument 
calls.  This dramatically improves the QoI for error messages in argument lists,
typically turning a error+note combo into a single specific error message.

Some minor improvements coming (and also generalizing this to n-ary calls), but it 
is nice that all the infrastructure is starting to come together...



Swift SVN r30905

Author: lattner

lib/Sema/CSDiag.cpp

@@ -2722,7 +2722,12 @@ Expr *FailureDiagnosis::typeCheckChildIndependently(Expr *subExpr,
 
   // If we have a conversion type, but it has type variables (from the current
   // ConstraintSystem), then we can't use it.
-  if (convertType && convertType->hasTypeVariable()) {
+  if (convertType &&
+      (convertType->hasTypeVariable() ||
+       // If the contextual type has an archetype, we need to open it, but
+       // don't know how yet.
+       // FIXME: implement opening of archetypes.
+       convertType->hasArchetype())) {
     convertType = Type();
     convertTypePurpose = CTP_Unused;
   }
@@ -3047,9 +3052,6 @@ typeCheckArgumentChildIndependently(Expr *argExpr, Type argType,
       argType = candidates[0].getArgumentType();
   }
 
-  // TODO: Don't disable all type information.
-  argType = Type();
-
   auto CTPurpose = argType ? CTP_CallArgument : CTP_Unused;
 
   // FIXME: This should all just be a matter of getting type type of the
@@ -3063,6 +3065,19 @@ typeCheckArgumentChildIndependently(Expr *argExpr, Type argType,
     if (exampleInputType && exampleInputType->is<InOutType>())
       options |= TCC_AllowLValue;
 
+    // If the argtype is a tuple type with default arguments, we need to get
+    // the scalar element or punt it, since type checking the subexpression
+    // won't be able to find the default argument provider.
+    if (argType)
+      if (auto argTT = argType->getAs<TupleType>())
+        if (argTT->hasAnyDefaultValues()) {
+          int scalarElt = argTT->getElementForScalarInit();
+          if (scalarElt == -1)
+            argType = Type();
+          else
+            argType = argTT->getElementType(scalarElt);
+        }
+    
     return typeCheckChildIndependently(unwrapParenExpr(argExpr), argType,
                                        CTPurpose, options);
   }

test/ClangModules/attr-swift_private.swift

@@ -110,7 +110,7 @@ func testCF(a: __PrivCFTypeRef, b: __PrivCFSubRef, c: __PrivInt) {
   makeSureAnyObject(a)
   makeSureAnyObject(b)
 #if !IRGEN
-  makeSureAnyObject(c) // expected-error {{cannot invoke 'makeSureAnyObject' with an argument list of type '(__PrivInt)'}} expected-note {{expected an argument list of type '(AnyObject)'}}
+  makeSureAnyObject(c) // expected-error {{type '__PrivInt' (aka 'Int32') does not conform to protocol 'AnyObject'}}
 #endif
 }
 

test/ClangModules/cf.swift

@@ -13,7 +13,7 @@ func test0(fridge: CCRefrigeratorRef) {
 
 func test1(power: Unmanaged<CCPowerSupplyRef>) {
   assertUnmanaged(power)
-  let fridge = CCRefrigeratorCreate(power) // expected-error {{cannot invoke 'CCRefrigeratorCreate' with an argument list of type '(Unmanaged<CCPowerSupplyRef>)'}} expected-note{{expected an argument list of type '(CCPowerSupply!)'}}
+  let fridge = CCRefrigeratorCreate(power) // expected-error {{cannot convert value of type 'Unmanaged<CCPowerSupplyRef>' (aka 'Unmanaged<CCPowerSupply>') to expected argument type 'CCPowerSupply!'}}
   assertUnmanaged(fridge)
 }
 
@@ -111,8 +111,7 @@ func testOutParametersGood() {
 
 func testOutParametersBad() {
   let fridge: CCRefrigerator?
-  CCRefrigeratorCreateIndirect(fridge) // expected-error {{cannot invoke 'CCRefrigeratorCreateIndirect' with an argument list of type '(CCRefrigerator?)'}} 
-  // expected-note @-1 {{expected an argument list of type '(UnsafeMutablePointer<CCRefrigerator?>)'}}
+  CCRefrigeratorCreateIndirect(fridge) // expected-error {{cannot convert value of type 'CCRefrigerator?' to expected argument type 'UnsafeMutablePointer<CCRefrigerator?>' (aka 'UnsafeMutablePointer<Optional<CCRefrigerator>>')}} 
 
   let power: CCPowerSupply?
   CCRefrigeratorGetPowerSupplyIndirect(0, power) // expected-error {{cannot invoke 'CCRefrigeratorGetPowerSupplyIndirect' with an argument list of type '(Int, CCPowerSupply?)'}}

test/ClangModules/cfuncs_parse.swift

@@ -6,8 +6,7 @@ import cfuncs
 
 func test_cfunc1(i: Int) {
   cfunc1() // okay
-  cfunc1(i) // expected-error{{cannot invoke 'cfunc1' with an argument list of type '(Int)'}}
-  // expected-note @-1 {{expected an argument list of type '()'}}
+  cfunc1(i) // expected-error{{cannot convert value of type 'Int' to expected argument type '()'}}
 }
 
 func test_cfunc2(i: Int) {

test/ClangModules/nullability.swift

@@ -45,12 +45,10 @@ func testSomeClass(sc: SomeClass, osc: SomeClass?) {
 // Nullability with CF types.
 func testCF(fridge: CCRefrigerator) {
   CCRefrigeratorOpenDoSomething(fridge) // okay
-  CCRefrigeratorOpenDoSomething(nil) // expected-error{{cannot invoke 'CCRefrigeratorOpenDoSomething' with an argument list of type '(NilLiteralConvertible)'}}
-  // expected-note@-1{{expected an argument list of type '(CCRefrigerator)'}}
+  CCRefrigeratorOpenDoSomething(nil) // expected-error{{nil cannot be used in context expecting type 'CCRefrigerator'}}
 
   CCRefrigeratorOpenMaybeDoSomething(fridge) // okay
   CCRefrigeratorOpenMaybeDoSomething(nil) // okay
 
-  CCRefrigeratorOpenMaybeDoSomething(5) // expected-error{{cannot invoke}}
-  // expected-note@-1{{argument list of type '(CCRefrigerator?)'}}
+  CCRefrigeratorOpenMaybeDoSomething(5) // expected-error{{cannot convert value of type 'Int' to expected argument type 'CCRefrigerator?'}}
 }

test/ClangModules/objc_parse.swift

@@ -50,8 +50,7 @@ func instanceMethods(b: B) {
   // Both class and instance methods exist.
   b.description
   b.instanceTakesObjectClassTakesFloat(b)
-  b.instanceTakesObjectClassTakesFloat(2.0) // expected-error{{cannot invoke 'instanceTakesObjectClassTakesFloat' with an argument list of type '(Double)'}}
-  // expected-note @-1 {{expected an argument list of type '(AnyObject!)'}}
+  b.instanceTakesObjectClassTakesFloat(2.0) // expected-error{{cannot convert value of type 'Double' to expected argument type 'AnyObject!'}}
 
   // Instance methods with keyword components
   var obj = NSObject()
@@ -71,8 +70,7 @@ func classMethods(b: B, other: NSObject) {
   // Both class and instance methods exist.
   B.description()
   B.instanceTakesObjectClassTakesFloat(2.0)
-  B.instanceTakesObjectClassTakesFloat(other) // expected-error{{cannot invoke 'instanceTakesObjectClassTakesFloat' with an argument list of type '(NSObject)'}}
-  // expected-note @-1 {{expected an argument list of type '(Float)'}}
+  B.instanceTakesObjectClassTakesFloat(other) // expected-error{{cannot convert value of type 'NSObject' to expected argument type 'Float'}}
 
   // Call an instance method of NSObject.
   var c: AnyClass = B.myClass() // no-warning

test/ClangModules/protocol_metatype_object_conversion.swift

@@ -13,5 +13,5 @@ func takesProtocol(x: Protocol) {}
 
 takesProtocol(ObjCProto.self)
 takesProtocol(ObjCProto2.self)
-takesProtocol(NonObjCProto.self) // expected-error{{cannot invoke 'takesProtocol' with an argument list of type '(NonObjCProto.Protocol)'}} expected-note{{expected an argument list of type '(Protocol)'}}
-takesProtocol(TwoObjCProtos.self) // expected-error{{cannot invoke 'takesProtocol' with an argument list of type '(TwoObjCProtos.Protocol)'}} expected-note {{expected an argument list of type '(Protocol)'}}
+takesProtocol(NonObjCProto.self) // expected-error{{cannot convert value of type 'NonObjCProto.Protocol' to expected argument type 'Protocol'}}
+takesProtocol(TwoObjCProtos.self) // expected-error{{cannot convert value of type 'TwoObjCProtos.Protocol' (aka 'protocol<ObjCProto, ObjCProto2>.Protocol') to expected argument type 'Protocol'}}

test/Constraints/array_literal.swift

@@ -43,12 +43,12 @@ func useList<T>(l: List<T>) {}
 func useDict<K,V>(d: Dict<K,V>) {}
 
 useIntList([1,2,3])
-useIntList([1.0,2,3]) // expected-error{{cannot invoke 'useIntList' with an argument list of type '([Double])'}} expected-note{{expected an argument list of type '(IntList)'}}
+useIntList([1.0,2,3]) // expected-error{{cannot convert value of type '[Double]' to expected argument type 'IntList'}}
 useDoubleList([1.0,2,3])
 useDoubleList([1.0,2.0,3.0])
 
 useIntDict(["Niners" => 31, "Ravens" => 34])
-useIntDict(["Niners" => 31, "Ravens" => 34.0]) // expected-error{{cannot invoke 'useIntDict' with an argument list of type '([(String, Double)])'}} expected-note{{expected an argument list of type '(IntDict)'}}
+useIntDict(["Niners" => 31, "Ravens" => 34.0]) // expected-error{{cannot convert value of type '[(String, Double)]' to expected argument type 'IntDict'}}
 useDoubleDict(["Niners" => 31, "Ravens" => 34.0])
 useDoubleDict(["Niners" => 31.0, "Ravens" => 34])
 useDoubleDict(["Niners" => 31.0, "Ravens" => 34.0])

test/Constraints/casts_objc.swift

@@ -34,8 +34,7 @@ func nsobject_as_class_cast<T>(x: NSObject, _: T) {
 func test(a : CFString!, b : CFString) {
   var dict = NSMutableDictionary()
   let object = NSObject()
-  dict[a] = object // expected-error {{cannot subscript a value of type 'NSMutableDictionary' with an index of type 'CFString!'}}
-  // expected-note @-1 {{expected an argument list of type '(NSCopying)'}}
+  dict[a] = object // expected-error {{cannot convert value of type 'CFString!' to expected argument type 'NSCopying'}}
 
 
   dict[b] = object // expected-error {{type 'CFString' does not conform to protocol 'NSCopying'}}

test/Constraints/class.swift

@@ -22,7 +22,7 @@ func ternary<T>(cond: Bool,
                 @autoclosure _ ifFalse: () -> T) -> T {}
 
 f0(c)
-f0(a) // expected-error{{cannot invoke 'f0' with an argument list of type '(A)'}} expected-note {{expected an argument list of type '(B)'}}
+f0(a) // expected-error{{cannot convert value of type 'A' to expected argument type 'B'}}
 f0(ef)
 f0(fi)
 

test/Constraints/diagnostics.swift

@@ -37,8 +37,8 @@ var d : Double
 // Check the various forms of diagnostics the type checker can emit.
 
 // Tuple size mismatch.
-f1(  // expected-error {{cannot invoke 'f1' with an argument list of type '((Int) -> Int)'}}
-   f4 // expected-note @-1 {{expected an argument list of type '((Int, Float) -> Int)'}}
+f1(
+   f4 // expected-error {{cannot convert value of type '(Int) -> Int' to expected argument type '(Int, Float) -> Int'}}
    ) 
 
 // Tuple element unused.
@@ -56,12 +56,12 @@ f0(i, // expected-error {{cannot invoke 'f0' with an argument list of type '(Int
    )
 
 // Function result not a subtype.
-f1( // expected-error {{cannot invoke 'f1' with an argument list of type '((Int, Float) -> ())'}}
-   f0 // expected-note @-1 {{expected an argument list of type '((Int, Float) -> Int)'}}
+f1(
+   f0 // expected-error {{cannot convert value of type '(Int, Float) -> ()' to expected argument type '(Int, Float) -> Int'}}
    )
 
-f3( // expected-error {{cannot invoke 'f3' with an argument list of type '((((Int) -> Int)) -> Int)'}}
-   f2 // expected-note @-1 {{expected an argument list of type '(((Int) -> Float) -> Int)'}}
+f3(
+   f2 // expected-error {{cannot convert value of type '(((Int) -> Int)) -> Int' to expected argument type '((Int) -> Float) -> Int'}}
    )
 
 // FIXME: Can't test same-type diagnostic yet.
@@ -83,10 +83,8 @@ i.wobble() // expected-error{{value of type 'Int' has no member 'wobble'}}
 // Make sure we don't leave open existentials when diagnosing.
 // <rdar://problem/20598568>
 func pancakes(p: P2) {
-  f4(p.wonka) // expected-error{{cannot invoke 'f4' with an argument list of type '(() -> ())'}}
-  // expected-note@-1{{expected an argument list of type '(Int)'}}
-  f4(p.wonka()) // expected-error{{cannot invoke 'f4' with an argument list of type '()'}}
-  // expected-note@-1{{expected an argument list of type '(Int)'}}
+  f4(p.wonka) // expected-error{{cannot convert value of type '() -> ()' to expected argument type 'Int'}}
+  f4(p.wonka()) // expected-error{{cannot convert value of type '()' to expected argument type 'Int'}}
 }
 
 protocol Shoes {
@@ -263,7 +261,7 @@ _ = 4(1)  // expected-error {{cannot call value of non-function type 'Int'}}
 // <rdar://problem/21784170> Incongruous `unexpected trailing closure` error in `init` function which is cast and called without trailing closure.
 func rdar21784170() {
   let initial = (1.0 as Double, 2.0 as Double)
-  (Array.init as (Double...) -> Array<Double>)(initial as (Double, Double)) // expected-error {{cannot invoke value of type '(Double...) -> Array<Double>' with argument list '(Double, Double)'}}
+  (Array.init as (Double...) -> Array<Double>)(initial as (Double, Double)) // expected-error {{cannot invoke value of type '(Double...) -> Array<Double>' with argument list '(Double...)'}}
 }
 
 // <rdar://problem/21829141> BOGUS: unexpected trailing closure
@@ -295,9 +293,8 @@ func r20789423() {
   }
 
   let p: C
-  print(p.f(p)())  // expected-error {{cannot invoke 'f' with an argument list of type '(C)'}}
-  // expected-note @-1 {{expected an argument list of type '(Int)'}}
-  
+  print(p.f(p)())  // expected-error {{cannot convert value of type 'C' to expected argument type 'Int'}}
+
   let _f = { (v: Int) in  // expected-error {{unable to infer closure type in the current context}}
     // expected-note @-1 {{multi-statement closures require an explicit return type}}
     print("a")
@@ -313,17 +310,14 @@ func f7(a: Int)(b : Int) -> Int {
 }
 
 f7(1)(b: 1)
-f7(1.0)(2)       // expected-error {{cannot invoke 'f7' with an argument list of type '(Double)'}}
-// expected-note @-1 {{expected an argument list of type '(Int)'}}
+f7(1.0)(2)       // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
 
-f7(1)(1.0)       // expected-error {{cannot invoke 'f7' with an argument list of type '(Double)'}}
-// expected-note @-1 {{expected an argument list of type '(b: Int)'}}
+f7(1)(1.0)       // expected-error {{cannot convert value of type 'Double' to expected argument type '(b: Int)'}}
 
 let f8 = f7(2)
 f8(b: 1)
 f8(10)          // expected-error {{missing argument label 'b:' in call}}
-f8(1.0)         // expected-error {{cannot invoke 'f8' with an argument list of type '(Double)'}}
-// expected-note @-1 {{expected an argument list of type '(b: Int)'}}
+f8(1.0)         // expected-error {{cannot convert value of type 'Double' to expected argument type '(b: Int)'}}
 
 class CurriedClass {
   func method1() {}
@@ -333,35 +327,28 @@ class CurriedClass {
 
 let c = CurriedClass()
 _ = c.method1
-c.method1(1)         // expected-error {{cannot invoke 'method1' with an argument list of type '(Int)'}}
-// expected-note @-1 {{expected an argument list of type '()'}}
+c.method1(1)         // expected-error {{cannot convert value of type 'Int' to expected argument type '()'}}
 _ = c.method2(1)
-_ = c.method2(1.0)   // expected-error {{cannot invoke 'method2' with an argument list of type '(Double)'}}
-// expected-note @-1 {{expected an argument list of type '(Int)'}}
+_ = c.method2(1.0)   // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
 c.method2(1)(b: 2)
 c.method2(1)(c: 2)   // expected-error {{incorrect argument label in call (have 'c:', expected 'b:')}}
 c.method2(1)(c: 2.0) // expected-error {{cannot invoke 'method2' with an argument list of type '(c: Double)'}}
 // expected-note @-1 {{expected an argument list of type '(b: Int)'}}
 c.method2(1)(b: 2.0) // expected-error {{cannot invoke 'method2' with an argument list of type '(b: Double)'}}
 // expected-note @-1 {{expected an argument list of type '(b: Int)'}}
-c.method2(1.0)(b: 2) // expected-error {{cannot invoke 'method2' with an argument list of type '(Double)'}}
-// expected-note @-1 {{expected an argument list of type '(Int)'}}
-c.method2(1.0)(b: 2.0) // expected-error {{cannot invoke 'method2' with an argument list of type '(Double)'}}
-// expected-note @-1 {{expected an argument list of type '(Int)'}}
+c.method2(1.0)(b: 2) // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
+c.method2(1.0)(b: 2.0) // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
 
 CurriedClass.method1(c)()
 _ = CurriedClass.method1(c)
-CurriedClass.method1(c)(1)         // expected-error {{cannot invoke 'method1' with an argument list of type '(Int)'}}
-// expected-note @-1 {{expected an argument list of type '()'}}
-CurriedClass.method1(2.0)(1)       // expected-error {{cannot invoke 'method1' with an argument list of type '(Double)'}}
-// expected-note @-1 {{expected an argument list of type '(CurriedClass)'}}
+CurriedClass.method1(c)(1)         // expected-error {{cannot convert value of type 'Int' to expected argument type '()'}}
+CurriedClass.method1(2.0)(1)       // expected-error {{cannot convert value of type 'Double' to expected argument type 'CurriedClass'}}
 
 CurriedClass.method2(c)(32)(b: 1)
 _ = CurriedClass.method2(c)
 _ = CurriedClass.method2(c)(32)
 _ = CurriedClass.method2(1,2)      // expected-error {{extra argument in call}}
-CurriedClass.method2(c)(1.0)(b: 1) // expected-error {{cannot invoke 'method2' with an argument list of type '(Double)'}}
-// expected-note @-1 {{expected an argument list of type '(Int)'}}
+CurriedClass.method2(c)(1.0)(b: 1) // expected-error {{cannot convert value of type 'Double' to expected argument type 'Int'}}
 CurriedClass.method2(c)(1)(b: 1.0) // expected-error {{cannot invoke 'method2' with an argument list of type '(b: Double)'}}
 // expected-note @-1 {{expected an argument list of type '(b: Int)'}}
 CurriedClass.method2(c)(2)(c: 1.0) // expected-error {{cannot invoke 'method2' with an argument list of type '(c: Double)'}}
@@ -375,8 +362,7 @@ _ = CurriedClass.method3(c)(1, b: 2)(32) // expected-error {{cannot call value o
 _ = CurriedClass.method3(1, 2)           // expected-error {{extra argument in call}}
 CurriedClass.method3(c)(1.0, b: 1)       // expected-error {{cannot invoke 'method3' with an argument list of type '(Double, b: Int)'}}
 // expected-note @-1 {{expected an argument list of type '(Int, b: Int)'}}
-CurriedClass.method3(c)(1)               // expected-error {{cannot invoke 'method3' with an argument list of type '(Int)'}}
-// expected-note @-1 {{expected an argument list of type '(Int, b: Int)'}}
+CurriedClass.method3(c)(1)               // expected-error {{cannot convert value of type 'Int' to expected argument type '(Int, b: Int)'}}
 
 CurriedClass.method3(c)(c: 1.0)          // expected-error {{missing argument for parameter 'b' in call}}
 
@@ -385,10 +371,7 @@ extension CurriedClass {
   func f() {
     method3(1, b: 2)
     method3()            // expected-error {{missing argument for parameter #1 in call}}
-
-    method3(42)          // expected-error {{cannot invoke 'method3' with an argument list of type '(Int)'}}
-    // expected-note @-1 {{expected an argument list of type '(Int, b: Int)'}}
-
+    method3(42)          // expected-error {{cannot convert value of type 'Int' to expected argument type '(Int, b: Int)'}}
     method3(self)        // expected-error {{missing argument for parameter 'b' in call}}
   }
 }
@@ -422,8 +405,7 @@ func someGeneric19997471<T>(x: T) {
 func f20371273() {
   let x: [Int] = [1, 2, 3, 4]
   let y: UInt = 4
-  x.filter { $0 == y }  // expected-error {{cannot invoke 'filter' with an argument list of type '((UInt) -> Bool)'}}
-   // expected-note @-1 {{expected an argument list of type '(@noescape (Self.Generator.Element) throws -> Bool)'}}
+  x.filter { $0 == y }  // expected-error {{cannot convert value of type '(UInt) -> Bool' to expected argument type '@noescape (Int) throws -> Bool'}}
 }
 
 
@@ -500,12 +482,10 @@ class B {
 
 
 func test(a : B) {
-  B.f1(nil)    // expected-error {{cannot invoke 'f1' with an argument list of type '(NilLiteralConvertible)'}}
-  // expected-note @-1 {{expected an argument list of type '(AOpts)'}}
+  B.f1(nil)    // expected-error {{nil cannot be used in context expecting type 'AOpts'}}
   a.function(42, nil) //expected-error {{cannot invoke 'function' with an argument list of type '(Int, NilLiteralConvertible)'}}
   // expected-note @-1 {{expected an argument list of type '(Int8, a: AOpts)'}}
-  a.f2(nil)  // expected-error {{cannot invoke 'f2' with an argument list of type '(NilLiteralConvertible)'}}
-  // expected-note @-1 {{expected an argument list of type '(AOpts)'}}
+  a.f2(nil)  // expected-error {{nil cannot be used in context expecting type 'AOpts'}}
 }
 
 

test/Constraints/dictionary_literal.swift

@@ -18,7 +18,7 @@ func useDict<K, V>(d: Dictionary<K,V>) {}
 // Concrete dictionary literals.
 useDictStringInt([ "Hello" : 1 ])
 useDictStringInt([ "Hello" : 1, "World" : 2])
-useDictStringInt([ "Hello" : 1, "World" : 2.5]) // expected-error{{cannot invoke 'useDictStringInt' with an argument list of type '(Dictionary<String, Double>)'}} expected-note{{expected an argument list of type '(DictStringInt)'}}
+useDictStringInt([ "Hello" : 1, "World" : 2.5]) // expected-error{{cannot convert value of type 'Dictionary<String, Double>' to expected argument type 'DictStringInt'}}
 useDictStringInt([ 7 : 1, "World" : 2]) // expected-error{{type 'Int2048' does not conform to protocol 'IntegerLiteralConvertible'}}
 
 // Generic dictionary literals.