Merge pull request #12593 from xedin/rdar-35142121

[ConstraintSolver] Avoid unnecessarily increasing score when matching function types

Author: xedin

lib/Sema/CSSimplify.cpp

@@ -1150,8 +1150,6 @@ ConstraintSystem::matchFunctionTypes(FunctionType *func1, FunctionType *func2,
 
   TypeMatchOptions subflags = getDefaultDecompositionOptions(flags);
 
-  increaseScore(ScoreKind::SK_FunctionConversion);
-
   // Add a very narrow exception to SE-0110 by allowing functions that
   // take multiple arguments to be passed as an argument in places
   // that expect a function that takes a single tuple (of the same

test/Constraints/function_conversion.swift

@@ -36,3 +36,9 @@ a(c.d)
 func b<T>(_: (T) -> () -> ()) {}
 
 b(c.e)
+
+func bar(_: () -> ()) {}
+func bar(_: () throws -> ()) {}
+func bar_empty() {}
+
+bar(bar_empty)

test/Constraints/rdar35142121.swift

@@ -0,0 +1,12 @@
+// RUN: %target-swift-frontend -emit-sil -verify %s | %FileCheck %s
+
+func foo<T>(_ a: T) -> Int {
+  return 0
+}
+
+func foo(_ a: (Int) -> (Int)) -> Int {
+  return 42
+}
+
+// CHECK: function_ref @_T012rdar351421213fooS3icF : $@convention(thin) (@owned @noescape @callee_owned (Int) -> Int) -> Int
+let _ = foo({ (a: Int) -> Int in a + 1 })

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

@@ -1,4 +1,4 @@
-// RUN: %scale-test --invert-result --begin 2 --end 7 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --begin 2 --end 10 --step 1 --select incrementScopeCounter %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts
 

validation-test/Sema/type_checker_perf/slow/nil_coalescing.swift.gyb

@@ -1,4 +1,4 @@
-// RUN: %scale-test --invert-result --begin 1 --end 6 --step 1 --select incrementScopeCounter %s
+// RUN: %scale-test --invert-result --begin 1 --end 5 --step 1 --select incrementScopeCounter %s
 // REQUIRES: OS=macosx
 // REQUIRES: asserts