[index] Added a method indexTopLevelDecls to run indexing on a list of Decls.

[ilya-biryukov]

Summary

We need it in clangd for refactoring that replaces ASTUnit
with manual AST management.

[ilya-biryukov]

For reference: clangd refactoring https://reviews.llvm.org/D35406

[arphaman]

Nice, I will need something like this for the refactoring stress test tool in the future that verifies that the indexer and renaming engine have a similar view of the code.

include/clang/Index/IndexingAction.h

21 ↗

(On Diff #106595)

Please arrange the added declarations so that the whole list is in ordered alphabetically.

lib/Index/IndexingAction.cpp

181 ↗

(On Diff #106595)

clang-format?

[ilya-biryukov]

• Fixed formatting.

[ilya-biryukov]

lib/Index/IndexingAction.cpp

181 ↗

(On Diff #106595)

Sorry, didn't rerun it after a rename of the method. Fixed now.

[arphaman]

LGTM, thanks.

cfe/trunk/include/clang/Index/IndexingAction.h

 //===--- IndexingAction.h - Frontend index action -------------------------===//
 //
 //                     The LLVM Compiler Infrastructure
 //
 // This file is distributed under the University of Illinois Open Source
 // License. See LICENSE.TXT for details.
 //
 //===----------------------------------------------------------------------===//
 
 #ifndef LLVM_CLANG_INDEX_INDEXINGACTION_H
 #define LLVM_CLANG_INDEX_INDEXINGACTION_H
 
 #include "clang/Basic/LLVM.h"
+#include "llvm/ADT/ArrayRef.h"
 #include <memory>
 
 namespace clang {
+  class ASTContext;
   class ASTReader;
   class ASTUnit;
+  class Decl;
   class FrontendAction;
 
 namespace serialization {
   class ModuleFile;
 }
 
 namespace index {
   class IndexDataConsumer;

 createIndexingAction(std::shared_ptr<IndexDataConsumer> DataConsumer,
                      IndexingOptions Opts,
                      std::unique_ptr<FrontendAction> WrappedAction);
 
 void indexASTUnit(ASTUnit &Unit,
                   std::shared_ptr<IndexDataConsumer> DataConsumer,
                   IndexingOptions Opts);
 
-void indexModuleFile(serialization::ModuleFile &Mod,
-                     ASTReader &Reader,
+void indexTopLevelDecls(ASTContext &Ctx, ArrayRef<const Decl *> Decls,
+                        std::shared_ptr<IndexDataConsumer> DataConsumer,
+                        IndexingOptions Opts);
+
+void indexModuleFile(serialization::ModuleFile &Mod, ASTReader &Reader,
                      std::shared_ptr<IndexDataConsumer> DataConsumer,
                      IndexingOptions Opts);
 
 } // namespace index
 } // namespace clang
 
 #endif

cfe/trunk/lib/Index/IndexingAction.cpp

void index::indexASTUnit(ASTUnit &Unit,
                          IndexingOptions Opts) {
   IndexingContext IndexCtx(Opts, *DataConsumer);
   IndexCtx.setASTContext(Unit.getASTContext());
   DataConsumer->initialize(Unit.getASTContext());
   indexTranslationUnit(Unit, IndexCtx);
   DataConsumer->finish();
 }
 
+void index::indexTopLevelDecls(ASTContext &Ctx, ArrayRef<const Decl *> Decls,
+                               std::shared_ptr<IndexDataConsumer> DataConsumer,
+                               IndexingOptions Opts) {
+  IndexingContext IndexCtx(Opts, *DataConsumer);
+  IndexCtx.setASTContext(Ctx);
+
+  DataConsumer->initialize(Ctx);
+  for (const Decl *D : Decls)
+    IndexCtx.indexTopLevelDecl(D);
+  DataConsumer->finish();
+}
+
 void index::indexModuleFile(serialization::ModuleFile &Mod,
                             ASTReader &Reader,
                             std::shared_ptr<IndexDataConsumer> DataConsumer,
                             IndexingOptions Opts) {
   ASTContext &Ctx = Reader.getContext();
   IndexingContext IndexCtx(Opts, *DataConsumer);
   IndexCtx.setASTContext(Ctx);
   DataConsumer->initialize(Ctx);
 
   for (const Decl *D :Reader.getModuleFileLevelDecls(Mod)) {
     IndexCtx.indexTopLevelDecl(D);
   }
   DataConsumer->finish();
 }