AST: Remove unused methods from CaptureInfo

Author: slavapestov

include/swift/AST/AnyFunctionRef.h

@@ -83,10 +83,6 @@ class AnyFunctionRef {
     TheFunction.get<AbstractClosureExpr *>()->setCaptureInfo(captures);
   }
 
-  void getLocalCaptures(SmallVectorImpl<CapturedValue> &Result) const {
-    getCaptureInfo().getLocalCaptures(Result);
-  }
-
   bool hasType() const {
     if (auto *AFD = TheFunction.dyn_cast<AbstractFunctionDecl *>())
       return AFD->hasInterfaceType();

include/swift/AST/CaptureInfo.h

@@ -197,15 +197,6 @@ class CaptureInfo {
     return StorageAndFlags.getPointer()->getCaptures();
   }
 
-  /// Return a filtered list of the captures for this function,
-  /// filtering out global variables.  This function returns the list that
-  /// actually needs to be closed over.
-  ///
-  void getLocalCaptures(SmallVectorImpl<CapturedValue> &Result) const;
-
-  /// \returns true if getLocalCaptures() will return a non-empty list.
-  bool hasLocalCaptures() const;
-
   /// \returns true if the function captures any generic type parameters.
   bool hasGenericParamCaptures() const {
     // FIXME: Ideally, everywhere that synthesizes a function should include

include/swift/AST/Decl.h

@@ -8019,10 +8019,6 @@ class FuncDecl : public AbstractFunctionDecl {
   /// prior to type checking.
   bool isBinaryOperator() const;
 
-  void getLocalCaptures(SmallVectorImpl<CapturedValue> &Result) const {
-    return getCaptureInfo().getLocalCaptures(Result);
-  }
-
   ParamDecl **getImplicitSelfDeclStorage();
 
   /// Get the supertype method this method overrides, if any.

lib/AST/CaptureInfo.cpp

@@ -59,34 +59,7 @@ CaptureInfo CaptureInfo::empty() {
   return result;
 }
 
-bool CaptureInfo::hasLocalCaptures() const {
-  for (auto capture : getCaptures()) {
-    if (capture.isLocalCapture())
-      return true;
-  }
-  return false;
-}
-
-
-void CaptureInfo::
-getLocalCaptures(SmallVectorImpl<CapturedValue> &Result) const {
-  if (!hasLocalCaptures()) return;
-
-  Result.reserve(getCaptures().size());
-
-  // Filter out global variables.
-  for (auto capture : getCaptures()) {
-    if (!capture.isLocalCapture())
-      continue;
-
-    Result.push_back(capture);
-  }
-}
-
 VarDecl *CaptureInfo::getIsolatedParamCapture() const {
-  if (!hasLocalCaptures())
-    return nullptr;
-
   for (const auto &capture : getCaptures()) {
     // NOTE: isLocalCapture() returns false if we have dynamic self metadata
     // since dynamic self metadata is never an isolated capture. So we can just

lib/SIL/IR/TypeLowering.cpp

@@ -4153,9 +4153,10 @@ TypeConverter::getLoweredLocalCaptures(SILDeclRef fn) {
     if (captureInfo.hasOpaqueValueCapture())
       capturesOpaqueValue = captureInfo.getOpaqueValue();
 
-    SmallVector<CapturedValue, 4> localCaptures;
-    captureInfo.getLocalCaptures(localCaptures);
-    for (auto capture : localCaptures) {
+    for (auto capture : captureInfo.getCaptures()) {
+      if (!capture.isLocalCapture())
+        continue;
+
       // If the capture is of another local function, grab its transitive
       // captures instead.
       if (auto capturedFn = getAnyFunctionRefFromCapture(capture)) {

lib/SILOptimizer/Differentiation/Common.cpp

@@ -475,7 +475,6 @@ findMinimalDerivativeConfiguration(AbstractFunctionDecl *original,
         original->getInterfaceType()->castTo<AnyFunctionType>());
 
     if (silParameterIndices->getCapacity() < parameterIndices->getCapacity()) {
-      assert(original->getCaptureInfo().hasLocalCaptures());
       silParameterIndices =
         silParameterIndices->extendingCapacity(original->getASTContext(),
                                                parameterIndices->getCapacity());

lib/Sema/TypeCheckConcurrency.cpp

@@ -2478,9 +2478,9 @@ namespace {
 
     /// Check closure captures for Sendable violations.
     void checkLocalCaptures(AnyFunctionRef localFunc) {
-      SmallVector<CapturedValue, 2> captures;
-      localFunc.getCaptureInfo().getLocalCaptures(captures);
-      for (const auto &capture : captures) {
+      for (const auto &capture : localFunc.getCaptureInfo().getCaptures()) {
+        if (!capture.isLocalCapture())
+          continue;
         if (capture.isDynamicSelfMetadata())
           continue;
         if (capture.isOpaqueValue())