[Refactoring] Store SourceFile on AsyncConverter

Author: hamishknight

lib/IDE/Refactoring.cpp

@@ -5117,7 +5117,7 @@ class ScopedDeclCollector : private SourceEntityWalker {
 /// the code the user intended. In most cases the refactoring will continue,
 /// with any unhandled decls wrapped in placeholders instead.
 class AsyncConverter : private SourceEntityWalker {
-  ASTContext &Context;
+  SourceFile *SF;
   SourceManager &SM;
   DiagnosticEngine &DiagEngine;
 
@@ -5170,11 +5170,11 @@ class AsyncConverter : private SourceEntityWalker {
 
 public:
   /// Convert a function
-  AsyncConverter(ASTContext &Context, SourceManager &SM,
+  AsyncConverter(SourceFile *SF, SourceManager &SM,
                  DiagnosticEngine &DiagEngine, AbstractFunctionDecl *FD,
                  const AsyncHandlerParamDesc &TopHandler)
-      : Context(Context), SM(SM), DiagEngine(DiagEngine),
-        StartNode(FD), TopHandler(TopHandler), OS(Buffer) {
+      : SF(SF), SM(SM), DiagEngine(DiagEngine), StartNode(FD),
+        TopHandler(TopHandler), OS(Buffer) {
     Placeholders.insert(TopHandler.getHandler());
     ScopedDecls.collect(FD);
 
@@ -5184,21 +5184,21 @@ class AsyncConverter : private SourceEntityWalker {
   }
 
   /// Convert a call
-  AsyncConverter(ASTContext &Context, SourceManager &SM,
-                 DiagnosticEngine &DiagEngine, CallExpr *CE, BraceStmt *Scope,
-                 SourceFile &SF)
-      : Context(Context), SM(SM), DiagEngine(DiagEngine),
-        StartNode(CE), OS(Buffer) {
+  AsyncConverter(SourceFile *SF, SourceManager &SM,
+                 DiagnosticEngine &DiagEngine, CallExpr *CE, BraceStmt *Scope)
+      : SF(SF), SM(SM), DiagEngine(DiagEngine), StartNode(CE), OS(Buffer) {
     ScopedDecls.collect(CE);
 
     // Create the initial scope, can be more accurate than the general
     // \c ScopedDeclCollector as there is a starting point.
     llvm::DenseSet<const Decl *> UsedDecls;
-    DeclCollector::collect(Scope, SF, UsedDecls);
-    ReferenceCollector::collect(StartNode, Scope, SF, UsedDecls);
+    DeclCollector::collect(Scope, *SF, UsedDecls);
+    ReferenceCollector::collect(StartNode, Scope, *SF, UsedDecls);
     addNewScope(UsedDecls);
   }
 
+  ASTContext &getASTContext() const { return SF->getASTContext(); }
+
   bool convert() {
     assert(Buffer.empty() && "AsyncConverter can only be used once");
 
@@ -5956,7 +5956,7 @@ class AsyncConverter : private SourceEntityWalker {
   /// Returns a unique name using \c Name as base that doesn't clash with any
   /// other names in the current scope.
   Identifier createUniqueName(StringRef Name) {
-    Identifier Ident = Context.getIdentifier(Name);
+    Identifier Ident = getASTContext().getIdentifier(Name);
 
     auto &CurrentNames = ScopedNames.back();
     if (CurrentNames.count(Ident)) {
@@ -5967,7 +5967,7 @@ class AsyncConverter : private SourceEntityWalker {
       do {
         UniquedName = Name;
         UniquedName.append(std::to_string(UniqueId));
-        Ident = Context.getIdentifier(UniquedName);
+        Ident = getASTContext().getIdentifier(UniquedName);
         UniqueId++;
       } while (CurrentNames.count(Ident));
     }
@@ -6254,7 +6254,7 @@ bool RefactoringActionConvertCallToAsyncAlternative::performChange() {
   if (!Scopes.empty())
     Scope = cast<BraceStmt>(Scopes.back().get<Stmt *>());
 
-  AsyncConverter Converter(Ctx, SM, DiagEngine, CE, Scope, *CursorInfo.SF);
+  AsyncConverter Converter(TheFile, SM, DiagEngine, CE, Scope);
   if (!Converter.convert())
     return true;
 
@@ -6282,7 +6282,7 @@ bool RefactoringActionConvertToAsync::performChange() {
          "Should not run performChange when refactoring is not applicable");
 
   auto HandlerDesc = AsyncHandlerParamDesc::find(FD, /*ignoreName=*/true);
-  AsyncConverter Converter(Ctx, SM, DiagEngine, FD, HandlerDesc);
+  AsyncConverter Converter(TheFile, SM, DiagEngine, FD, HandlerDesc);
   if (!Converter.convert())
     return true;
 
@@ -6319,14 +6319,14 @@ bool RefactoringActionAddAsyncAlternative::performChange() {
   assert(HandlerDesc.isValid() &&
          "Should not run performChange when refactoring is not applicable");
 
-  AsyncConverter Converter(Ctx, SM, DiagEngine, FD, HandlerDesc);
+  AsyncConverter Converter(TheFile, SM, DiagEngine, FD, HandlerDesc);
   if (!Converter.convert())
     return true;
 
   EditConsumer.accept(SM, FD->getAttributeInsertionLoc(false),
                       "@available(*, deprecated, message: \"Prefer async "
                       "alternative instead\")\n");
-  AsyncConverter LegacyBodyCreator(Ctx, SM, DiagEngine, FD, HandlerDesc);
+  AsyncConverter LegacyBodyCreator(TheFile, SM, DiagEngine, FD, HandlerDesc);
   if (LegacyBodyCreator.createLegacyBody()) {
     LegacyBodyCreator.replace(FD->getBody(), EditConsumer);
   }