Merge pull request #38645 from hamishknight/misc-sema-cleanups

Author: hamishknight

lib/Sema/CSFix.cpp

@@ -428,14 +428,7 @@ getStructuralTypeContext(const Solution &solution, ConstraintLocator *locator) {
     return std::make_tuple(CTP,
                            solution.getType(assignExpr->getSrc()),
                            solution.getType(assignExpr->getDest())->getRValueType());
-  } else if (auto *call = getAsExpr<CallExpr>(locator->getAnchor())) {
-    assert(isa<TypeExpr>(call->getFn()));
-    return std::make_tuple(
-        CTP_Initialization,
-        solution.getType(call->getFn())->getMetatypeInstanceType(),
-        solution.getType(call->getArg()));
   }
-
   return None;
 }
 

lib/Sema/ConstraintSystem.cpp

@@ -3778,16 +3778,7 @@ static bool diagnoseContextualFunctionCallGenericAmbiguity(
                                             TypeVariableType *typeVar) {
     auto argParamMatch = argMatching->second.parameterBindings[argIdx];
     auto param = applyFnType->getParams()[argParamMatch.front()];
-    if (param.isVariadic()) {
-      auto paramType = param.getParameterType();
-      // Variadic parameter is constructed as an ArraySliceType(which is
-      // just sugared type for a bound generic) with the closure type as
-      // element.
-      auto baseType = paramType->getDesugaredType()->castTo<BoundGenericType>();
-      auto paramFnType = baseType->getGenericArgs()[0]->castTo<FunctionType>();
-      return cs.typeVarOccursInType(typeVar, paramFnType->getResult());
-    }
-    auto paramFnType = param.getParameterType()->castTo<FunctionType>();
+    auto paramFnType = param.getPlainType()->castTo<FunctionType>();
     return cs.typeVarOccursInType(typeVar, paramFnType->getResult());
   };
 

lib/Sema/TypeCheckStmt.cpp

@@ -1257,16 +1257,6 @@ static void diagnoseIgnoredLiteral(ASTContext &Ctx, LiteralExpr *LE) {
 }
 
 void TypeChecker::checkIgnoredExpr(Expr *E) {
-  // For parity with C, several places in the grammar accept multiple
-  // comma-separated expressions and then bind them together as an implicit
-  // tuple.  Break these apart and check them separately.
-  if (E->isImplicit() && isa<TupleExpr>(E)) {
-    for (auto Elt : cast<TupleExpr>(E)->getElements()) {
-      checkIgnoredExpr(Elt);
-    }
-    return;
-  }
-
   // Skip checking if there is no type, which presumably means there was a
   // type error.
   if (!E->getType()) {