Merge pull request #14464 from xedin/rdar-37160679-4.1

[4.1][CSSolver] Increment score when performing certain function conversions

Author: AnnaZaks

lib/Sema/CSSimplify.cpp

@@ -1089,6 +1089,8 @@ ConstraintSystem::matchFunctionTypes(FunctionType *func1, FunctionType *func2,
       return SolutionKind::Error;
     if (kind < ConstraintKind::Subtype)
       return SolutionKind::Error;
+
+    increaseScore(SK_FunctionConversion);
   }
 
   // A non-throwing function can be a subtype of a throwing function.
@@ -1890,8 +1892,10 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
       // If the 2nd type is an autoclosure, then we don't actually want to
       // treat these as parallel. The first type needs wrapping in a closure
       // despite already being a function type.
-      if (!func1->isAutoClosure() && func2->isAutoClosure())
+      if (!func1->isAutoClosure() && func2->isAutoClosure()) {
+        increaseScore(SK_FunctionConversion);
         break;
+      }
       return matchFunctionTypes(func1, func2, kind, flags, locator);
     }
 

test/Constraints/rdar37160679.swift

@@ -0,0 +1,21 @@
+// RUN: %target-swift-frontend -emit-sil -verify %s | %FileCheck %s
+
+func foo(_ f: @autoclosure () -> Int) {}
+func foo(_ f: () -> Int) {}
+
+func bar(_ f: () throws -> Int) {}
+func bar(_ f: () -> Int) {}
+
+func baz(a1: @autoclosure () -> Int,
+         a2: () -> Int,
+         b1: () throws -> Int,
+         b2: () -> Int) {
+  // CHECK: function_ref @_T012rdar371606793fooySiyXKF
+  foo(a1)
+  // CHECK: function_ref @_T012rdar371606793fooySiycF
+  foo(a2)
+  // CHECK: function_ref @_T012rdar371606793barySiyKcF
+  bar(b1)
+  // CHECK: function_ref @_T012rdar371606793barySiycF
+  bar(b2)
+}