Update test cases for constraint solver performance hack

Author: DougGregor

test/Compatibility/enum_cases.swift

@@ -19,13 +19,18 @@ enum G_E<T> {
 let arr: [String] = []
 let _ = arr.map(E.foo) // Ok
 let _ = arr.map(E.bar) // Ok
-let _ = arr.map(E.two) // expected-error {{cannot convert value of type '(Int, Int) -> E' to expected argument type '(String) -> _'}}
-let _ = arr.map(E.tuple) // expected-error {{cannot convert value of type '((x: Int, y: Int)) -> E' to expected argument type '(String) -> _'}}
+let _ = arr.map(E.two) // expected-error {{cannot invoke 'map' with an argument list of type '((Int, Int) -> E)'}}
+// expected-note@-1{{expected an argument list of type '((Self.Element) throws -> T)'}}
+let _ = arr.map(E.tuple) // expected-error {{cannot invoke 'map' with an argument list of type '(((x: Int, y: Int)) -> E)'}}
+// expected-note@-1{{expected an argument list of type '((Self.Element) throws -> T)'}}
 
 let _ = arr.map(G_E<String>.foo) // Ok
 let _ = arr.map(G_E<String>.bar) // Ok
-let _ = arr.map(G_E<String>.two) // expected-error {{cannot convert value of type '(String, String) -> G_E<String>' to expected argument type '(String) -> _'}}
-let _ = arr.map(G_E<Int>.tuple) // expected-error {{cannot convert value of type '((x: Int, y: Int)) -> G_E<Int>' to expected argument type '(String) -> _'}}
+let _ = arr.map(G_E<String>.two) // expected-error {{cannot invoke 'map' with an argument list of type '((String, String) -> G_E<String>)'}}
+// expected-note@-1{{expected an argument list of type '((Self.Element) throws -> T)'}}
+
+let _ = arr.map(G_E<Int>.tuple) // expected-error {{cannot invoke 'map' with an argument list of type '(((x: Int, y: Int)) -> G_E<Int>)'}}
+// expected-note@-1{{expected an argument list of type '((Self.Element) throws -> T)'}}
 
 let _ = E.foo("hello") // expected-error {{missing argument label 'bar:' in call}}
 let _ = E.bar("hello") // Ok

test/Constraints/enum_cases.swift

@@ -19,13 +19,18 @@ enum G_E<T> {
 let arr: [String] = []
 let _ = arr.map(E.foo) // Ok
 let _ = arr.map(E.bar) // Ok
-let _ = arr.map(E.two) // expected-error {{cannot convert value of type '(Int, Int) -> E' to expected argument type '(String) -> _'}}
-let _ = arr.map(E.tuple) // expected-error {{cannot convert value of type '((x: Int, y: Int)) -> E' to expected argument type '(String) -> _'}}
+let _ = arr.map(E.two) // expected-error {{cannot invoke 'map' with an argument list of type '((Int, Int) -> E)'}}
+// expected-note@-1{{expected an argument list of type '((Self.Element) throws -> T)'}}
+
+let _ = arr.map(E.tuple) // expected-error {{cannot invoke 'map' with an argument list of type '(((x: Int, y: Int)) -> E)'}}
+// expected-note@-1{{expected an argument list of type '((Self.Element) throws -> T)'}}
 
 let _ = arr.map(G_E<String>.foo) // Ok
 let _ = arr.map(G_E<String>.bar) // Ok
-let _ = arr.map(G_E<String>.two) // expected-error {{cannot convert value of type '(String, String) -> G_E<String>' to expected argument type '(String) -> _'}}
-let _ = arr.map(G_E<Int>.tuple) // expected-error {{cannot convert value of type '((x: Int, y: Int)) -> G_E<Int>' to expected argument type '(String) -> _'}}
+let _ = arr.map(G_E<String>.two) // expected-error {{cannot invoke 'map' with an argument list of type '((String, String) -> G_E<String>)'}}
+// expected-note@-1{{expected an argument list of type '((Self.Element) throws -> T)'}}
+let _ = arr.map(G_E<Int>.tuple) // expected-error {{cannot invoke 'map' with an argument list of type '(((x: Int, y: Int)) -> G_E<Int>)'}}
+// expected-note@-1{{expected an argument list of type '((Self.Element) throws -> T)'}}
 
 let _ = E.foo("hello") // expected-error {{missing argument label 'bar:' in call}}
 let _ = E.bar("hello") // Ok

test/Constraints/optional.swift

@@ -81,14 +81,22 @@ func test8(_ x : AnyObject?) {
 
 
 // Partial ordering with optionals
-func test9_helper<T>(_ x: T) -> Int { }
-func test9_helper<T>(_ x: T?) -> Double { }
+func test9_helper<T: P>(_ x: T) -> Int { }
+func test9_helper<T: P>(_ x: T?) -> Double { }
+
+func test9_helper2<T>(_ x: T) -> Int { }
+func test9_helper2<T>(_ x: T?) -> Double { }
 
 func test9(_ i: Int, io: Int?) {
   let result = test9_helper(i)
   var _: Int = result
   let result2 = test9_helper(io)
   let _: Double = result2
+
+  let result3 = test9_helper2(i)
+  var _: Double = result3
+  let result4 = test9_helper2(io)
+  let _: Double = result4
 }
 
 protocol P { }

validation-test/Sema/type_checker_perf/slow/rdar23620262.swift renamed to validation-test/Sema/type_checker_perf/fast/rdar23620262.swift

@@ -1,8 +1,9 @@
 // RUN: %target-typecheck-verify-swift -solver-expression-time-threshold=1
 // REQUIRES: tools-release,no_asserts
 
+// expected-no-diagnostics
+
 let a: [Double] = []
 _ = a.map { $0 - 1.0 }
-// expected-error@-1 {{expression was too complex to be solved in reasonable time; consider breaking up the expression into distinct sub-expressions}}
      .map { $0 * $0 }
      .reduce(0, +) / Double(a.count)