---

yaml
---
r: 345055
b: refs/heads/master
c: 48b1731
h: refs/heads/master
i:
  345053: 0d61816
  345051: 99ceda0
  345047: 8e9812b
  345039: 1aa840e
  345023: 2ba59f2

Author: swift-ci

[refs]

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

trunk/lib/Sema/CSSolver.cpp

@@ -2066,7 +2066,7 @@ bool ConstraintSystem::solveForDisjunction(
 
   auto noSolutions = solveForDisjunctionChoices(
       disjunction->getNestedConstraints(), locator, solutions,
-      allowFreeTypeVariables, isExplicitConversionConstraint(disjunction));
+      allowFreeTypeVariables, disjunction->isExplicitConversion());
 
   if (hasDisabledChoices) {
     // Re-enable previously disabled overload choices.

trunk/lib/Sema/Constraint.cpp

@@ -536,6 +536,17 @@ static void uniqueTypeVariables(SmallVectorImpl<TypeVariableType *> &typeVars) {
                  typeVars.end());
 }
 
+bool Constraint::isExplicitConversion() const {
+  assert(Kind == ConstraintKind::Disjunction);
+
+  if (auto *locator = getLocator()) {
+    if (auto anchor = locator->getAnchor())
+      return isa<CoerceExpr>(anchor);
+  }
+
+  return false;
+}
+
 Constraint *Constraint::create(ConstraintSystem &cs, ConstraintKind kind, 
                                Type first, Type second,
                                ConstraintLocator *locator) {

trunk/lib/Sema/Constraint.h

@@ -583,6 +583,10 @@ class Constraint final : public llvm::ilist_node<Constraint>,
     return count;
   }
 
+  /// Determine if this constraint represents explicit conversion,
+  /// e.g. coercion constraint "as X" which forms a disjunction.
+  bool isExplicitConversion() const;
+
   /// Retrieve the overload choice for an overload-binding constraint.
   OverloadChoice getOverloadChoice() const {
     assert(Kind == ConstraintKind::BindOverload);

trunk/lib/Sema/ConstraintSystem.h

@@ -2108,20 +2108,6 @@ class ConstraintSystem {
   Type getResultType(const AbstractClosureExpr *E);
 
 private:
-  /// Determine if the given constraint represents explicit conversion,
-  /// e.g. coercion constraint "as X" which forms a disjunction.
-  bool isExplicitConversionConstraint(Constraint *constraint) const {
-    if (constraint->getKind() != ConstraintKind::Disjunction)
-      return false;
-
-    if (auto locator = constraint->getLocator()) {
-      if (auto anchor = locator->getAnchor())
-        return isa<CoerceExpr>(anchor);
-    }
-
-    return false;
-  }
-
   /// Introduce the constraints associated with the given type variable
   /// into the worklist.
   void addTypeVariableConstraintsToWorkList(TypeVariableType *typeVar);