Merge pull request swiftlang#23077 from DougGregor/revert-common-type

Author: swift-ci

lib/Sema/CSSimplify.cpp

@@ -131,49 +131,25 @@ bool constraints::areConservativelyCompatibleArgumentLabels(
     hasCurriedSelf = false;
   } else if (baseType->is<AnyMetatypeType>() && decl->isInstanceMember()) {
     hasCurriedSelf = false;
+  } else if (isa<EnumElementDecl>(decl)) {
+    hasCurriedSelf = false;
   } else {
     hasCurriedSelf = true;
   }
 
-  return areConservativelyCompatibleArgumentLabels(
-      decl, hasCurriedSelf, labels, hasTrailingClosure);
-}
-
-Expr *constraints::getArgumentLabelTargetExpr(Expr *fn) {
-  // Dig out the function, looking through, parentheses, ?, and !.
-  do {
-    fn = fn->getSemanticsProvidingExpr();
-
-    if (auto force = dyn_cast<ForceValueExpr>(fn)) {
-      fn = force->getSubExpr();
-      continue;
-    }
-
-    if (auto bind = dyn_cast<BindOptionalExpr>(fn)) {
-      fn = bind->getSubExpr();
-      continue;
-    }
-
-    return fn;
-  } while (true);
-}
-
-bool constraints::
-areConservativelyCompatibleArgumentLabels(ValueDecl *decl,
-                                          bool hasCurriedSelf,
-                                          ArrayRef<Identifier> labels,
-                                          bool hasTrailingClosure) {
   const AnyFunctionType *fTy;
 
   if (auto fn = dyn_cast<AbstractFunctionDecl>(decl)) {
     fTy = fn->getInterfaceType()->castTo<AnyFunctionType>();
   } else if (auto subscript = dyn_cast<SubscriptDecl>(decl)) {
     assert(!hasCurriedSelf && "Subscripts never have curried 'self'");
     fTy = subscript->getInterfaceType()->castTo<AnyFunctionType>();
+  } else if (auto enumElement = dyn_cast<EnumElementDecl>(decl)) {
+    fTy = enumElement->getInterfaceType()->castTo<AnyFunctionType>();
   } else {
     return true;
   }
-  
+
   SmallVector<AnyFunctionType::Param, 8> argInfos;
   for (auto argLabel : labels) {
     argInfos.push_back(AnyFunctionType::Param(Type(), argLabel, {}));
@@ -184,7 +160,7 @@ areConservativelyCompatibleArgumentLabels(ValueDecl *decl,
     levelTy = levelTy->getResult()->getAs<AnyFunctionType>();
     assert(levelTy && "Parameter list curry level does not match type");
   }
-  
+
   auto params = levelTy->getParams();
   SmallBitVector defaultMap =
     computeDefaultMap(params, decl, hasCurriedSelf);
@@ -198,6 +174,25 @@ areConservativelyCompatibleArgumentLabels(ValueDecl *decl,
                              listener, unusedParamBindings);
 }
 
+Expr *constraints::getArgumentLabelTargetExpr(Expr *fn) {
+  // Dig out the function, looking through, parentheses, ?, and !.
+  do {
+    fn = fn->getSemanticsProvidingExpr();
+
+    if (auto force = dyn_cast<ForceValueExpr>(fn)) {
+      fn = force->getSubExpr();
+      continue;
+    }
+
+    if (auto bind = dyn_cast<BindOptionalExpr>(fn)) {
+      fn = bind->getSubExpr();
+      continue;
+    }
+
+    return fn;
+  } while (true);
+}
+
 /// Determine the default type-matching options to use when decomposing a
 /// constraint into smaller constraints.
 static ConstraintSystem::TypeMatchOptions getDefaultDecompositionOptions(