---

yaml
---
r: 345958
b: refs/heads/master
c: 21475b3
h: refs/heads/master

Author: swift-ci

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: d84c7d475c3b2b156c10ce15608004173ce5dbe9
+refs/heads/master: 21475b3ee52fd9938819102ef6ca0cc3767c018a
 refs/heads/master-next: 203b3026584ecad859eb328b2e12490099409cd5
 refs/tags/osx-passed: b6b74147ef8a386f532cf9357a1bde006e552c54
 refs/tags/swift-2.2-SNAPSHOT-2015-12-01-a: 6bb18e013c2284f2b45f5f84f2df2887dc0f7dea

trunk/lib/Sema/CSSimplify.cpp

@@ -2473,6 +2473,7 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
   if (conversionsOrFixes.size() > 1) {
     auto fixedLocator = getConstraintLocator(locator);
     SmallVector<Constraint *, 2> constraints;
+
     for (auto potential : conversionsOrFixes) {
       auto constraintKind = kind;
 
@@ -2485,6 +2486,10 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
         constraints.push_back(
           Constraint::createRestricted(*this, constraintKind, *restriction,
                                        type1, type2, fixedLocator));
+
+        if (constraints.back()->getKind() == ConstraintKind::Equal)
+          constraints.back()->setFavored();
+
         continue;
       }
 
@@ -2493,6 +2498,16 @@ ConstraintSystem::matchTypes(Type type1, Type type2, ConstraintKind kind,
         Constraint::createFixed(*this, constraintKind, fix, type1, type2,
                                 fixedLocator));
     }
+
+    // Sort favored constraints first.
+    std::sort(constraints.begin(), constraints.end(),
+              [&](Constraint *lhs, Constraint *rhs) -> bool {
+                if (lhs->isFavored() == rhs->isFavored())
+                  return false;
+
+                return lhs->isFavored();
+              });
+
     addDisjunctionConstraint(constraints, fixedLocator);
     return getTypeMatchSuccess();
   }

trunk/test/expr/primary/literal/collection_upcast_opt.swift

@@ -15,7 +15,8 @@ struct TakesArray<T> {
 // CHECK: assign_expr
 // CHECK-NOT: collection_upcast_expr
 // CHECK: array_expr type='[(X) -> Void]'
-// CHECK-NEXT: function_conversion_expr implicit type='(X) -> Void'
+// CHECK: semantic_expr
+// CHECK: function_conversion_expr implicit type='(X) -> Void'
 // CHECK-NEXT: {{declref_expr.*x1}}
 // CHECK-NEXT: function_conversion_expr implicit type='(X) -> Void'
 // CHECK-NEXT: {{declref_expr.*x2}}

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

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