Merge pull request #34243 from slavapestov/fix-astscope-leak

ASTScope: Allocate list of local bindings for BraceStmt in the ASTContext

Author: slavapestov

include/swift/AST/ASTScope.h

@@ -1534,11 +1534,11 @@ class BraceStmtScope final : public AbstractStmtScope {
   BraceStmt *const stmt;
 
   /// Declarations which are in scope from the beginning of the statement.
-  SmallVector<ValueDecl *, 2> localFuncsAndTypes;
+  ArrayRef<ValueDecl *> localFuncsAndTypes;
 
   /// Declarations that are normally in scope only after their
   /// definition.
-  SmallVector<VarDecl *, 2> localVars;
+  ArrayRef<VarDecl *> localVars;
 
   /// The end location for bindings introduced in this scope. This can
   /// extend past the actual end of the BraceStmt in top-level code,
@@ -1548,8 +1548,8 @@ class BraceStmtScope final : public AbstractStmtScope {
 
 public:
   BraceStmtScope(BraceStmt *e,
-                 SmallVector<ValueDecl *, 2> localFuncsAndTypes,
-                 SmallVector<VarDecl *, 2> localVars,
+                 ArrayRef<ValueDecl *> localFuncsAndTypes,
+                 ArrayRef<VarDecl *> localVars,
                  SourceLoc endLoc)
       : stmt(e),
         localFuncsAndTypes(localFuncsAndTypes),

lib/AST/ASTScopeCreation.cpp

@@ -588,12 +588,15 @@ class NodeAdder
     if (endLoc.hasValue())
       endLocForBraceStmt = *endLoc;
 
-    if (auto *s = scopeCreator.getASTContext().Stats)
+    ASTContext &ctx = scopeCreator.getASTContext();
+    if (auto *s = ctx.Stats)
       ++s->getFrontendCounters().NumBraceStmtASTScopes;
 
     return
         scopeCreator.constructExpandAndInsert<BraceStmtScope>(
-            p, bs, std::move(localFuncsAndTypes), std::move(localVars),
+            p, bs,
+            ctx.AllocateCopy(localFuncsAndTypes),
+            ctx.AllocateCopy(localVars),
             endLocForBraceStmt);
   }