Merge pull request #5434 from DougGregor/minor-solver-tweaks

Author: swift-ci

lib/Sema/CSSimplify.cpp

@@ -602,7 +602,9 @@ getCalleeDeclAndArgs(ConstraintSystem &cs,
         // References to instance members on a metatype stay at level 0.
         // Everything else is level 1.
         if (!(function->isInstanceMember() &&
-              cs.simplifyType(choice->getBaseType())->is<AnyMetatypeType>()))
+              cs.getFixedTypeRecursive(choice->getBaseType(),
+                                       /*wantRValue=*/true)
+                ->is<AnyMetatypeType>()))
           level = 1;
       } else if (isa<SubscriptDecl>(decl)) {
         // Subscript level 1 == the indices.

lib/Sema/CSSolver.cpp

@@ -780,7 +780,9 @@ static PotentialBindings getPotentialBindings(ConstraintSystem &cs,
 
     case ConstraintKind::Defaultable:
       // Do these in a separate pass.
-      defaultableConstraints.push_back(constraint);
+      if (cs.getFixedTypeRecursive(constraint->getFirstType(), true)
+            ->getAs<TypeVariableType>() == typeVar)
+        defaultableConstraints.push_back(constraint);
       continue;
 
     case ConstraintKind::Disjunction: