Author: ioeric Date: Tue Sep 18 01:52:14 2018 New Revision: 342452 URL: http://llvm.org/viewvc/llvm-project?rev=342452&view=rev Log: [clangd] Adapt API change after 342451.
Modified: clang-tools-extra/trunk/clangd/FindSymbols.cpp clang-tools-extra/trunk/clangd/XRefs.cpp clang-tools-extra/trunk/clangd/index/FileIndex.cpp Modified: clang-tools-extra/trunk/clangd/FindSymbols.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/FindSymbols.cpp?rev=342452&r1=342451&r2=342452&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/FindSymbols.cpp (original) +++ clang-tools-extra/trunk/clangd/FindSymbols.cpp Tue Sep 18 01:52:14 2018 @@ -270,8 +270,9 @@ getDocumentSymbols(ParsedAST &AST) { IndexOpts.SystemSymbolFilter = index::IndexingOptions::SystemSymbolFilterKind::DeclarationsOnly; IndexOpts.IndexFunctionLocals = false; - indexTopLevelDecls(AST.getASTContext(), AST.getLocalTopLevelDecls(), - DocumentSymbolsCons, IndexOpts); + indexTopLevelDecls(AST.getASTContext(), AST.getPreprocessor(), + AST.getLocalTopLevelDecls(), DocumentSymbolsCons, + IndexOpts); return DocumentSymbolsCons.takeSymbols(); } Modified: clang-tools-extra/trunk/clangd/XRefs.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/XRefs.cpp?rev=342452&r1=342451&r2=342452&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/XRefs.cpp (original) +++ clang-tools-extra/trunk/clangd/XRefs.cpp Tue Sep 18 01:52:14 2018 @@ -206,8 +206,8 @@ IdentifiedSymbol getSymbolAtPosition(Par IndexOpts.SystemSymbolFilter = index::IndexingOptions::SystemSymbolFilterKind::All; IndexOpts.IndexFunctionLocals = true; - indexTopLevelDecls(AST.getASTContext(), AST.getLocalTopLevelDecls(), - DeclMacrosFinder, IndexOpts); + indexTopLevelDecls(AST.getASTContext(), AST.getPreprocessor(), + AST.getLocalTopLevelDecls(), DeclMacrosFinder, IndexOpts); return {DeclMacrosFinder.getFoundDecls(), DeclMacrosFinder.takeMacroInfos()}; } @@ -414,8 +414,8 @@ findRefs(const std::vector<const Decl *> IndexOpts.SystemSymbolFilter = index::IndexingOptions::SystemSymbolFilterKind::All; IndexOpts.IndexFunctionLocals = true; - indexTopLevelDecls(AST.getASTContext(), AST.getLocalTopLevelDecls(), - RefFinder, IndexOpts); + indexTopLevelDecls(AST.getASTContext(), AST.getPreprocessor(), + AST.getLocalTopLevelDecls(), RefFinder, IndexOpts); return std::move(RefFinder).take(); } Modified: clang-tools-extra/trunk/clangd/index/FileIndex.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/index/FileIndex.cpp?rev=342452&r1=342451&r2=342452&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/index/FileIndex.cpp (original) +++ clang-tools-extra/trunk/clangd/index/FileIndex.cpp Tue Sep 18 01:52:14 2018 @@ -54,7 +54,7 @@ indexAST(ASTContext &AST, std::shared_pt SymbolCollector Collector(std::move(CollectorOpts)); Collector.setPreprocessor(PP); - index::indexTopLevelDecls(AST, DeclsToIndex, Collector, IndexOpts); + index::indexTopLevelDecls(AST, *PP, DeclsToIndex, Collector, IndexOpts); const auto &SM = AST.getSourceManager(); const auto *MainFileEntry = SM.getFileEntryForID(SM.getMainFileID()); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits