AST: Add ParamDecl::toFunctionParam()

Author: slavapestov

include/swift/AST/Decl.h

@@ -5323,6 +5323,8 @@ class ParamDecl : public VarDecl {
 
   SourceRange getSourceRange() const;
 
+  AnyFunctionType::Param toFunctionParam(Type type = Type()) const;
+
   // Implement isa/cast/dyncast/etc.
   static bool classof(const Decl *D) { 
     return D->getKind() == DeclKind::Param;

include/swift/AST/ParameterList.h

@@ -127,12 +127,6 @@ class alignas(ParamDecl *) ParameterList final :
   /// based on the interface types of the parameters in this list.
   void getParams(SmallVectorImpl<AnyFunctionType::Param> &params) const;
 
-  /// Return a list of function parameters for this parameter list,
-  /// based on types provided by a callback.
-  void getParams(SmallVectorImpl<AnyFunctionType::Param> &params,
-                 llvm::function_ref<Type(ParamDecl *)> getType) const;
-
-
   /// Return the full source range of this parameter.
   SourceRange getSourceRange() const;
   SourceLoc getStartLoc() const { return getSourceRange().Start; }

lib/AST/Decl.cpp

@@ -5673,6 +5673,21 @@ Type ParamDecl::getVarargBaseTy(Type VarArgT) {
   return T;
 }
 
+AnyFunctionType::Param ParamDecl::toFunctionParam(Type type) const {
+  if (!type)
+    type = getInterfaceType();
+
+  if (isVariadic())
+    type = ParamDecl::getVarargBaseTy(type);
+
+  auto label = getArgumentName();
+  auto flags = ParameterTypeFlags::fromParameterType(type,
+                                                     isVariadic(),
+                                                     isAutoClosure(),
+                                                     getValueOwnership());
+  return AnyFunctionType::Param(type, label, flags);
+}
+
 void ParamDecl::setDefaultValue(Expr *E) {
   if (!DefaultValueAndFlags.getPointer()) {
     if (!E) return;

lib/AST/Parameter.cpp

@@ -89,29 +89,8 @@ ParameterList *ParameterList::clone(const ASTContext &C,
 
 void ParameterList::getParams(
                         SmallVectorImpl<AnyFunctionType::Param> &params) const {
-  getParams(params,
-            [](ParamDecl *decl) { return decl->getInterfaceType(); });
-}
-
-void ParameterList::getParams(
-                          SmallVectorImpl<AnyFunctionType::Param> &params,
-                          llvm::function_ref<Type(ParamDecl *)> getType) const {
-  if (size() == 0)
-    return;
-
-  for (auto P : *this) {
-    auto type = getType(P);
-
-    if (P->isVariadic())
-      type = ParamDecl::getVarargBaseTy(type);
-
-    auto label = P->getArgumentName();
-    auto flags = ParameterTypeFlags::fromParameterType(type,
-                                                       P->isVariadic(),
-                                                       P->isAutoClosure(),
-                                                       P->getValueOwnership());
-    params.emplace_back(type, label, flags);
-  }
+  for (auto P : *this)
+    params.push_back(P->toFunctionParam());
 }
 
 

lib/Sema/CSGen.cpp

@@ -2036,7 +2036,8 @@ namespace {
                           SmallVectorImpl<AnyFunctionType::Param> &params) {
       auto *paramList = closureExpr->getParameters();
       unsigned i = 0;
-      paramList->getParams(params, [&](ParamDecl *param) {
+
+      for (auto *param : *paramList) {
         auto *locator = CS.getConstraintLocator(
             closureExpr, LocatorPathElt::getTupleElement(i++));
         Type paramType, internalType;
@@ -2058,8 +2059,8 @@ namespace {
                            locator);
         }
         CS.setType(param, internalType);
-        return paramType;
-      });
+        params.push_back(param->toFunctionParam(paramType));
+      }
     }
 
     /// Produces a type for the given pattern, filling in any missing