SIL: Use walkPackReferences() instead of bespoke logic

Author: slavapestov

lib/SIL/IR/AbstractionPattern.cpp

@@ -2206,7 +2206,18 @@ class SubstFunctionTypePatternVisitor
     auto patternTy = visit(substPatternType, origPatternType);
 
     // Find a pack parameter from the pattern to expand over.
-    auto countParam = findExpandedPackParameter(patternTy);
+    CanType countParam;
+    patternTy->walkPackReferences([&](Type t) {
+      if (t->isTypeParameter()) {
+        auto param = ty->getRootGenericParam();
+        if (param->isParameterPack()) {
+          countParam = CanType(param);
+          return true;
+        }
+      }
+
+      return false;
+    });
 
     // If that didn't work, we should be able to find an expansion
     // to use from either the substituted type or the subs.  At worst,
@@ -2216,37 +2227,6 @@ class SubstFunctionTypePatternVisitor
     return CanPackExpansionType::get(patternTy, countParam);
   }
 
-  static CanType findExpandedPackParameter(CanType patternType) {
-    struct Walker : public TypeWalker {
-      CanType Result;
-      Action walkToTypePre(Type _ty) override {
-        auto ty = CanType(_ty);
-
-        // Don't recurse inside pack expansions.
-        if (isa<PackExpansionType>(ty)) {
-          return Action::SkipChildren;
-        }
-
-        // Consider type parameters.
-        if (ty->isTypeParameter()) {
-          auto param = ty->getRootGenericParam();
-          if (param->isParameterPack()) {
-            Result = CanType(param);
-            return Action::Stop;
-          }
-          return Action::SkipChildren;
-        }
-
-        // Otherwise continue.
-        return Action::Continue;
-      }
-    };
-
-    Walker walker;
-    patternType.walk(walker);
-    return walker.Result;
-  }
-
   CanType visitExistentialType(CanExistentialType exist,
                                AbstractionPattern pattern) {
     // Avoid walking into the constraint type if we can help it.