[clang-tools-extra] r343780 - [clangd] expose MergedIndex class
Sam McCall via cfe-commits
cfe-commits at lists.llvm.org
Thu Oct 4 10:17:29 PDT 2018
Sorry! r343800 should fix.
On Thu, Oct 4, 2018 at 6:33 PM <douglas.yung at sony.com> wrote:
> Hi Sam,
>
> Your change is causing a build failure on one of the build bots. Can you
> take a look?
>
> http://lab.llvm.org:8011/builders/clang-x86_64-linux-abi-test/builds/33139
>
> FAILED:
> tools/clang/tools/extra/unittests/clangd/CMakeFiles/ClangdTests.dir/TestTU.cpp.o
>
> /usr/bin/c++ -DGTEST_HAS_RTTI=0 -DGTEST_HAS_TR1_TUPLE=0
> -DGTEST_LANG_CXX11=1 -D_DEBUG -D_GNU_SOURCE -D__STDC_CONSTANT_MACROS
> -D__STDC_FORMAT_MACROS -D__STDC_LIMIT_MACROS
> -Itools/clang/tools/extra/unittests/clangd
> -I/home/buildslave/buildslave1a/clang-x86_64-linux-abi-test/llvm/tools/clang/tools/extra/unittests/clangd
> -I/home/buildslave/buildslave1a/clang-x86_64-linux-abi-test/llvm/tools/clang/include
> -Itools/clang/include -Iinclude
> -I/home/buildslave/buildslave1a/clang-x86_64-linux-abi-test/llvm/include
> -I/home/buildslave/buildslave1a/clang-x86_64-linux-abi-test/llvm/tools/clang/tools/extra/clangd
> -I/home/buildslave/buildslave1a/clang-x86_64-linux-abi-test/llvm/utils/unittest/googletest/include
> -I/home/buildslave/buildslave1a/clang-x86_64-linux-abi-test/llvm/utils/unittest/googlemock/include
> -fPIC -fvisibility-inlines-hidden -std=c++11 -Wall -Wextra
> -Wno-unused-parameter -Wwrite-strings -Wcast-qual
> -Wno-missing-field-initializers -pedantic -Wno-long-long
> -Wno-maybe-uninitialized -Wdelete-non-virtual-dtor -Wno-comment
> -ffunction-sections -fdata-sections -fno-common -Woverloaded-virtual
> -fno-strict-aliasing -O3 -UNDEBUG -Wno-variadic-macros -fno-exceptions
> -fno-rtti -MD -MT
> tools/clang/tools/extra/unittests/clangd/CMakeFiles/ClangdTests.dir/TestTU.cpp.o
> -MF
> tools/clang/tools/extra/unittests/clangd/CMakeFiles/ClangdTests.dir/TestTU.cpp.o.d
> -o
> tools/clang/tools/extra/unittests/clangd/CMakeFiles/ClangdTests.dir/TestTU.cpp.o
> -c
> /home/buildslave/buildslave1a/clang-x86_64-linux-abi-test/llvm/tools/clang/tools/extra/unittests/clangd/TestTU.cpp
> /home/buildslave/buildslave1a/clang-x86_64-linux-abi-test/llvm/tools/clang/tools/extra/unittests/clangd/TestTU.cpp:
> In member function ‘std::unique_ptr<clang::clangd::SymbolIndex>
> clang::clangd::TestTU::index() const’:
> /home/buildslave/buildslave1a/clang-x86_64-linux-abi-test/llvm/tools/clang/tools/extra/unittests/clangd/TestTU.cpp:56:10:
> error: could not convert ‘Idx’ from
> ‘std::unique_ptr<clang::clangd::FileIndex>’ to
> ‘std::unique_ptr<clang::clangd::SymbolIndex>’
> return Idx;
> ^
> /home/buildslave/buildslave1a/clang-x86_64-linux-abi-test/llvm/tools/clang/tools/extra/unittests/clangd/TestTU.cpp:57:1:
> warning: control reaches end of non-void function [-Wreturn-type]
> }
> ^
>
> Douglas Yung
>
> > -----Original Message-----
> > From: cfe-commits [mailto:cfe-commits-bounces at lists.llvm.org] On Behalf
> > Of Sam McCall via cfe-commits
> > Sent: Thursday, October 04, 2018 7:20
> > To: cfe-commits at lists.llvm.org
> > Subject: [clang-tools-extra] r343780 - [clangd] expose MergedIndex
> > class
> >
> > Author: sammccall
> > Date: Thu Oct 4 07:20:22 2018
> > New Revision: 343780
> >
> > URL: http://llvm.org/viewvc/llvm-project?rev=343780&view=rev
> > Log:
> > [clangd] expose MergedIndex class
> >
> > Summary:
> > This allows inheriting from it, so index() can ga away and allowing
> > TestTU::index) to be fixed.
> >
> > Reviewers: ioeric
> >
> > Subscribers: ilya-biryukov, MaskRay, jkorous, arphaman, kadircet, cfe-
> > commits
> >
> > Differential Revision: https://reviews.llvm.org/D52250
> >
> > Modified:
> > clang-tools-extra/trunk/clangd/ClangdServer.cpp
> > clang-tools-extra/trunk/clangd/ClangdServer.h
> > clang-tools-extra/trunk/clangd/index/FileIndex.cpp
> > clang-tools-extra/trunk/clangd/index/FileIndex.h
> > clang-tools-extra/trunk/clangd/index/Merge.cpp
> > clang-tools-extra/trunk/clangd/index/Merge.h
> > clang-tools-extra/trunk/unittests/clangd/FileIndexTests.cpp
> > clang-tools-extra/trunk/unittests/clangd/IndexTests.cpp
> > clang-tools-extra/trunk/unittests/clangd/TestTU.cpp
> >
> > Modified: clang-tools-extra/trunk/clangd/ClangdServer.cpp
> > URL: http://llvm.org/viewvc/llvm-project/clang-tools-
> > extra/trunk/clangd/ClangdServer.cpp?rev=343780&r1=343779&r2=343780&view
> > =diff
> > =======================================================================
> > =======
> > --- clang-tools-extra/trunk/clangd/ClangdServer.cpp (original)
> > +++ clang-tools-extra/trunk/clangd/ClangdServer.cpp Thu Oct 4 07:20:22
> > 2018
> > @@ -117,20 +117,17 @@ ClangdServer::ClangdServer(GlobalCompila
> > : nullptr,
> > Opts.UpdateDebounce, Opts.RetentionPolicy) {
> > if (DynamicIdx && Opts.StaticIndex) {
> > - MergedIndex = mergeIndex(&DynamicIdx->index(), Opts.StaticIndex);
> > - Index = MergedIndex.get();
> > + MergedIdx =
> > + llvm::make_unique<MergedIndex>(DynamicIdx.get(),
> > Opts.StaticIndex);
> > + Index = MergedIdx.get();
> > } else if (DynamicIdx)
> > - Index = &DynamicIdx->index();
> > + Index = DynamicIdx.get();
> > else if (Opts.StaticIndex)
> > Index = Opts.StaticIndex;
> > else
> > Index = nullptr;
> > }
> >
> > -const SymbolIndex *ClangdServer::dynamicIndex() const {
> > - return DynamicIdx ? &DynamicIdx->index() : nullptr;
> > -}
> > -
> > void ClangdServer::setRootPath(PathRef RootPath) {
> > auto FS = FSProvider.getFileSystem();
> > auto Status = FS->status(RootPath);
> >
> > Modified: clang-tools-extra/trunk/clangd/ClangdServer.h
> > URL: http://llvm.org/viewvc/llvm-project/clang-tools-
> > extra/trunk/clangd/ClangdServer.h?rev=343780&r1=343779&r2=343780&view=d
> > iff
> > =======================================================================
> > =======
> > --- clang-tools-extra/trunk/clangd/ClangdServer.h (original)
> > +++ clang-tools-extra/trunk/clangd/ClangdServer.h Thu Oct 4 07:20:22
> > 2018
> > @@ -206,7 +206,7 @@ public:
> >
> > /// Returns the active dynamic index if one was built.
> > /// This can be useful for testing, debugging, or observing memory
> > usage.
> > - const SymbolIndex *dynamicIndex() const;
> > + const SymbolIndex *dynamicIndex() const { return DynamicIdx.get(); }
> >
> > // Blocks the main thread until the server is idle. Only for use in
> > tests.
> > // Returns false if the timeout expires.
> > @@ -244,7 +244,7 @@ private:
> > // If present, an index of symbols in open files. Read via *Index.
> > std::unique_ptr<FileIndex> DynamicIdx;
> > // If present, storage for the merged static/dynamic index. Read via
> > *Index.
> > - std::unique_ptr<SymbolIndex> MergedIndex;
> > + std::unique_ptr<SymbolIndex> MergedIdx;
> >
> > // GUARDED_BY(CachedCompletionFuzzyFindRequestMutex)
> > llvm::StringMap<llvm::Optional<FuzzyFindRequest>>
> >
> > 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=343780&r1=343779&r2=343780&v
> > iew=diff
> > =======================================================================
> > =======
> > --- clang-tools-extra/trunk/clangd/index/FileIndex.cpp (original)
> > +++ clang-tools-extra/trunk/clangd/index/FileIndex.cpp Thu Oct 4
> > 07:20:22 2018
> > @@ -152,10 +152,10 @@ std::unique_ptr<SymbolIndex> FileSymbols
> > }
> >
> > FileIndex::FileIndex(std::vector<std::string> URISchemes)
> > - : URISchemes(std::move(URISchemes)),
> > + : MergedIndex(&MainFileIndex, &PreambleIndex),
> > + URISchemes(std::move(URISchemes)),
> > PreambleIndex(PreambleSymbols.buildMemIndex()),
> > - MainFileIndex(MainFileSymbols.buildMemIndex()),
> > - MergedIndex(mergeIndex(&MainFileIndex, &PreambleIndex)) {}
> > + MainFileIndex(MainFileSymbols.buildMemIndex()) {}
> >
> > void FileIndex::updatePreamble(PathRef Path, ASTContext &AST,
> > std::shared_ptr<Preprocessor> PP) {
> >
> > Modified: clang-tools-extra/trunk/clangd/index/FileIndex.h
> > URL: http://llvm.org/viewvc/llvm-project/clang-tools-
> > extra/trunk/clangd/index/FileIndex.h?rev=343780&r1=343779&r2=343780&vie
> > w=diff
> > =======================================================================
> > =======
> > --- clang-tools-extra/trunk/clangd/index/FileIndex.h (original)
> > +++ clang-tools-extra/trunk/clangd/index/FileIndex.h Thu Oct 4
> > 07:20:22 2018
> > @@ -19,6 +19,7 @@
> > #include "ClangdUnit.h"
> > #include "Index.h"
> > #include "MemIndex.h"
> > +#include "Merge.h"
> > #include "clang/Lex/Preprocessor.h"
> > #include <memory>
> >
> > @@ -59,15 +60,12 @@ private:
> >
> > /// This manages symbols from files and an in-memory index on all
> > symbols.
> > /// FIXME: Expose an interface to remove files that are closed.
> > -class FileIndex {
> > +class FileIndex : public MergedIndex {
> > public:
> > /// If URISchemes is empty, the default schemes in SymbolCollector
> > will be
> > /// used.
> > FileIndex(std::vector<std::string> URISchemes = {});
> >
> > - // Presents a merged view of the supplied main-file and preamble
> > ASTs.
> > - const SymbolIndex &index() const { return *MergedIndex; }
> > -
> > /// Update preamble symbols of file \p Path with all declarations in
> > \p AST
> > /// and macros in \p PP.
> > void updatePreamble(PathRef Path, ASTContext &AST,
> > @@ -102,8 +100,6 @@ private:
> > // (Note that symbols *only* in the main file are not indexed).
> > FileSymbols MainFileSymbols;
> > SwapIndex MainFileIndex;
> > -
> > - std::unique_ptr<SymbolIndex> MergedIndex; // Merge preamble and
> > main index.
> > };
> >
> > /// Retrieves symbols and refs of local top level decls in \p AST
> > (i.e.
> >
> > Modified: clang-tools-extra/trunk/clangd/index/Merge.cpp
> > URL: http://llvm.org/viewvc/llvm-project/clang-tools-
> > extra/trunk/clangd/index/Merge.cpp?rev=343780&r1=343779&r2=343780&view=
> > diff
> > =======================================================================
> > =======
> > --- clang-tools-extra/trunk/clangd/index/Merge.cpp (original)
> > +++ clang-tools-extra/trunk/clangd/index/Merge.cpp Thu Oct 4 07:20:22
> > 2018
> > @@ -17,111 +17,96 @@
> >
> > namespace clang {
> > namespace clangd {
> > -namespace {
> >
> > using namespace llvm;
> >
> > -class MergedIndex : public SymbolIndex {
> > - public:
> > - MergedIndex(const SymbolIndex *Dynamic, const SymbolIndex *Static)
> > - : Dynamic(Dynamic), Static(Static) {}
> > -
> > - // FIXME: Deleted symbols in dirty files are still returned (from
> > Static).
> > - // To identify these eliminate these, we should:
> > - // - find the generating file from each Symbol which is
> > Static-only
> > - // - ask Dynamic if it has that file (needs new
> > SymbolIndex method)
> > - // - if so, drop the Symbol.
> > - bool fuzzyFind(const FuzzyFindRequest &Req,
> > - function_ref<void(const Symbol &)> Callback) const
> > override {
> > - // We can't step through both sources in parallel. So:
> > - // 1) query all dynamic symbols, slurping results into a slab
> > - // 2) query the static symbols, for each one:
> > - // a) if it's not in the dynamic slab, yield it directly
> > - // b) if it's in the dynamic slab, merge it and yield the
> > result
> > - // 3) now yield all the dynamic symbols we haven't processed.
> > - trace::Span Tracer("MergedIndex fuzzyFind");
> > - bool More = false; // We'll be incomplete if either source was.
> > - SymbolSlab::Builder DynB;
> > - unsigned DynamicCount = 0;
> > - unsigned StaticCount = 0;
> > - unsigned MergedCount = 0;
> > - More |= Dynamic->fuzzyFind(Req, [&](const Symbol &S) {
> > - ++DynamicCount;
> > - DynB.insert(S);
> > - });
> > - SymbolSlab Dyn = std::move(DynB).build();
> > -
> > - DenseSet<SymbolID> SeenDynamicSymbols;
> > - More |= Static->fuzzyFind(Req, [&](const Symbol &S) {
> > - auto DynS = Dyn.find(S.ID);
> > - ++StaticCount;
> > - if (DynS == Dyn.end())
> > - return Callback(S);
> > - ++MergedCount;
> > - SeenDynamicSymbols.insert(S.ID);
> > - Callback(mergeSymbol(*DynS, S));
> > - });
> > - SPAN_ATTACH(Tracer, "dynamic", DynamicCount);
> > - SPAN_ATTACH(Tracer, "static", StaticCount);
> > - SPAN_ATTACH(Tracer, "merged", MergedCount);
> > - for (const Symbol &S : Dyn)
> > - if (!SeenDynamicSymbols.count(S.ID))
> > - Callback(S);
> > - return More;
> > - }
> > +// FIXME: Deleted symbols in dirty files are still returned (from
> > Static).
> > +// To identify these eliminate these, we should:
> > +// - find the generating file from each Symbol which is
> > Static-only
> > +// - ask Dynamic if it has that file (needs new SymbolIndex
> > method)
> > +// - if so, drop the Symbol.
> > +bool MergedIndex::fuzzyFind(const FuzzyFindRequest &Req,
> > + function_ref<void(const Symbol &)>
> > Callback) const {
> > + // We can't step through both sources in parallel. So:
> > + // 1) query all dynamic symbols, slurping results into a slab
> > + // 2) query the static symbols, for each one:
> > + // a) if it's not in the dynamic slab, yield it directly
> > + // b) if it's in the dynamic slab, merge it and yield the result
> > + // 3) now yield all the dynamic symbols we haven't processed.
> > + trace::Span Tracer("MergedIndex fuzzyFind");
> > + bool More = false; // We'll be incomplete if either source was.
> > + SymbolSlab::Builder DynB;
> > + unsigned DynamicCount = 0;
> > + unsigned StaticCount = 0;
> > + unsigned MergedCount = 0;
> > + More |= Dynamic->fuzzyFind(Req, [&](const Symbol &S) {
> > + ++DynamicCount;
> > + DynB.insert(S);
> > + });
> > + SymbolSlab Dyn = std::move(DynB).build();
> > +
> > + DenseSet<SymbolID> SeenDynamicSymbols;
> > + More |= Static->fuzzyFind(Req, [&](const Symbol &S) {
> > + auto DynS = Dyn.find(S.ID);
> > + ++StaticCount;
> > + if (DynS == Dyn.end())
> > + return Callback(S);
> > + ++MergedCount;
> > + SeenDynamicSymbols.insert(S.ID);
> > + Callback(mergeSymbol(*DynS, S));
> > + });
> > + SPAN_ATTACH(Tracer, "dynamic", DynamicCount);
> > + SPAN_ATTACH(Tracer, "static", StaticCount);
> > + SPAN_ATTACH(Tracer, "merged", MergedCount);
> > + for (const Symbol &S : Dyn)
> > + if (!SeenDynamicSymbols.count(S.ID))
> > + Callback(S);
> > + return More;
> > +}
> >
> > - void
> > - lookup(const LookupRequest &Req,
> > - llvm::function_ref<void(const Symbol &)> Callback) const
> > override {
> > - trace::Span Tracer("MergedIndex lookup");
> > - SymbolSlab::Builder B;
> > -
> > - Dynamic->lookup(Req, [&](const Symbol &S) { B.insert(S); });
> > -
> > - auto RemainingIDs = Req.IDs;
> > - Static->lookup(Req, [&](const Symbol &S) {
> > - const Symbol *Sym = B.find(S.ID);
> > - RemainingIDs.erase(S.ID);
> > - if (!Sym)
> > - Callback(S);
> > - else
> > - Callback(mergeSymbol(*Sym, S));
> > - });
> > - for (const auto &ID : RemainingIDs)
> > - if (const Symbol *Sym = B.find(ID))
> > - Callback(*Sym);
> > - }
> > +void MergedIndex::lookup(
> > + const LookupRequest &Req,
> > + llvm::function_ref<void(const Symbol &)> Callback) const {
> > + trace::Span Tracer("MergedIndex lookup");
> > + SymbolSlab::Builder B;
> > +
> > + Dynamic->lookup(Req, [&](const Symbol &S) { B.insert(S); });
> > +
> > + auto RemainingIDs = Req.IDs;
> > + Static->lookup(Req, [&](const Symbol &S) {
> > + const Symbol *Sym = B.find(S.ID);
> > + RemainingIDs.erase(S.ID);
> > + if (!Sym)
> > + Callback(S);
> > + else
> > + Callback(mergeSymbol(*Sym, S));
> > + });
> > + for (const auto &ID : RemainingIDs)
> > + if (const Symbol *Sym = B.find(ID))
> > + Callback(*Sym);
> > +}
> >
> > - void refs(const RefsRequest &Req,
> > - llvm::function_ref<void(const Ref &)> Callback) const
> > override {
> > - trace::Span Tracer("MergedIndex refs");
> > - // We don't want duplicated refs from the static/dynamic indexes,
> > - // and we can't reliably duplicate them because offsets may differ
> > slightly.
> > - // We consider the dynamic index authoritative and report all its
> > refs,
> > - // and only report static index refs from other files.
> > - //
> > - // FIXME: The heuristic fails if the dynamic index contains a
> > file, but all
> > - // refs were removed (we will report stale ones from the static
> > index).
> > - // Ultimately we should explicit check which index has the file
> > instead.
> > - llvm::StringSet<> DynamicIndexFileURIs;
> > - Dynamic->refs(Req, [&](const Ref &O) {
> > - DynamicIndexFileURIs.insert(O.Location.FileURI);
> > +void MergedIndex::refs(const RefsRequest &Req,
> > + llvm::function_ref<void(const Ref &)> Callback)
> > const {
> > + trace::Span Tracer("MergedIndex refs");
> > + // We don't want duplicated refs from the static/dynamic indexes,
> > + // and we can't reliably duplicate them because offsets may differ
> > slightly.
> > + // We consider the dynamic index authoritative and report all its
> > refs,
> > + // and only report static index refs from other files.
> > + //
> > + // FIXME: The heuristic fails if the dynamic index contains a file,
> > but all
> > + // refs were removed (we will report stale ones from the static
> > index).
> > + // Ultimately we should explicit check which index has the file
> > instead.
> > + llvm::StringSet<> DynamicIndexFileURIs;
> > + Dynamic->refs(Req, [&](const Ref &O) {
> > + DynamicIndexFileURIs.insert(O.Location.FileURI);
> > + Callback(O);
> > + });
> > + Static->refs(Req, [&](const Ref &O) {
> > + if (!DynamicIndexFileURIs.count(O.Location.FileURI))
> > Callback(O);
> > - });
> > - Static->refs(Req, [&](const Ref &O) {
> > - if (!DynamicIndexFileURIs.count(O.Location.FileURI))
> > - Callback(O);
> > - });
> > - }
> > -
> > - size_t estimateMemoryUsage() const override {
> > - return Dynamic->estimateMemoryUsage() + Static-
> > >estimateMemoryUsage();
> > - }
> > -
> > -private:
> > - const SymbolIndex *Dynamic, *Static;
> > -};
> > -} // namespace
> > + });
> > +}
> >
> > Symbol mergeSymbol(const Symbol &L, const Symbol &R) {
> > assert(L.ID == R.ID);
> > @@ -169,10 +154,5 @@ Symbol mergeSymbol(const Symbol &L, cons
> > return S;
> > }
> >
> > -std::unique_ptr<SymbolIndex> mergeIndex(const SymbolIndex *Dynamic,
> > - const SymbolIndex *Static) {
> > - return llvm::make_unique<MergedIndex>(Dynamic, Static);
> > -}
> > -
> > } // namespace clangd
> > } // namespace clang
> >
> > Modified: clang-tools-extra/trunk/clangd/index/Merge.h
> > URL: http://llvm.org/viewvc/llvm-project/clang-tools-
> > extra/trunk/clangd/index/Merge.h?rev=343780&r1=343779&r2=343780&view=di
> > ff
> > =======================================================================
> > =======
> > --- clang-tools-extra/trunk/clangd/index/Merge.h (original)
> > +++ clang-tools-extra/trunk/clangd/index/Merge.h Thu Oct 4 07:20:22
> > 2018
> > @@ -20,7 +20,7 @@ namespace clangd {
> > // Returned symbol may contain data owned by either source.
> > Symbol mergeSymbol(const Symbol &L, const Symbol &R);
> >
> > -// mergeIndex returns a composite index based on two provided Indexes:
> > +// MergedIndex is a composite index based on two provided Indexes:
> > // - the Dynamic index covers few files, but is relatively up-to-
> > date.
> > // - the Static index covers a bigger set of files, but is relatively
> > stale.
> > // The returned index attempts to combine results, and avoid
> > duplicates.
> > @@ -28,8 +28,25 @@ Symbol mergeSymbol(const Symbol &L, cons
> > // FIXME: We don't have a mechanism in Index to track deleted symbols
> > and
> > // refs in dirty files, so the merged index may return stale symbols
> > // and refs from Static index.
> > -std::unique_ptr<SymbolIndex> mergeIndex(const SymbolIndex *Dynamic,
> > - const SymbolIndex *Static);
> > +class MergedIndex : public SymbolIndex {
> > + const SymbolIndex *Dynamic, *Static;
> > +
> > +public:
> > + // The constructor does not access the symbols.
> > + // It's safe to inherit from this class and pass pointers to derived
> > members.
> > + MergedIndex(const SymbolIndex *Dynamic, const SymbolIndex *Static)
> > + : Dynamic(Dynamic), Static(Static) {}
> > +
> > + bool fuzzyFind(const FuzzyFindRequest &,
> > + llvm::function_ref<void(const Symbol &)>) const
> > override;
> > + void lookup(const LookupRequest &,
> > + llvm::function_ref<void(const Symbol &)>) const
> > override;
> > + void refs(const RefsRequest &,
> > + llvm::function_ref<void(const Ref &)>) const override;
> > + size_t estimateMemoryUsage() const override {
> > + return Dynamic->estimateMemoryUsage() + Static-
> > >estimateMemoryUsage();
> > + }
> > +};
> >
> > } // namespace clangd
> > } // namespace clang
> >
> > Modified: clang-tools-extra/trunk/unittests/clangd/FileIndexTests.cpp
> > URL: http://llvm.org/viewvc/llvm-project/clang-tools-
> > extra/trunk/unittests/clangd/FileIndexTests.cpp?rev=343780&r1=343779&r2
> > =343780&view=diff
> > =======================================================================
> > =======
> > --- clang-tools-extra/trunk/unittests/clangd/FileIndexTests.cpp
> > (original)
> > +++ clang-tools-extra/trunk/unittests/clangd/FileIndexTests.cpp Thu Oct
> > 4 07:20:22 2018
> > @@ -120,10 +120,10 @@ TEST(FileSymbolsTest, SnapshotAliveAfter
> > EXPECT_THAT(getRefs(*Symbols, ID), RefsAre({FileURI("f1.cc")}));
> > }
> >
> > -std::vector<std::string> match(const FileIndex &I,
> > +std::vector<std::string> match(const SymbolIndex &I,
> > const FuzzyFindRequest &Req) {
> > std::vector<std::string> Matches;
> > - I.index().fuzzyFind(Req, [&](const Symbol &Sym) {
> > + I.fuzzyFind(Req, [&](const Symbol &Sym) {
> > Matches.push_back((Sym.Scope + Sym.Name).str());
> > });
> > return Matches;
> > @@ -147,7 +147,7 @@ TEST(FileIndexTest, CustomizedURIScheme)
> > FuzzyFindRequest Req;
> > Req.Query = "";
> > bool SeenSymbol = false;
> > - M.index().fuzzyFind(Req, [&](const Symbol &Sym) {
> > + M.fuzzyFind(Req, [&](const Symbol &Sym) {
> > EXPECT_EQ(Sym.CanonicalDeclaration.FileURI, "unittest:///f.h");
> > SeenSymbol = true;
> > });
> > @@ -201,7 +201,7 @@ TEST(FileIndexTest, NoIncludeCollected)
> > FuzzyFindRequest Req;
> > Req.Query = "";
> > bool SeenSymbol = false;
> > - M.index().fuzzyFind(Req, [&](const Symbol &Sym) {
> > + M.fuzzyFind(Req, [&](const Symbol &Sym) {
> > EXPECT_TRUE(Sym.IncludeHeaders.empty());
> > SeenSymbol = true;
> > });
> > @@ -225,7 +225,7 @@ vector<Ty> make_vector(Arg A) {}
> > Req.Query = "";
> > bool SeenVector = false;
> > bool SeenMakeVector = false;
> > - M.index().fuzzyFind(Req, [&](const Symbol &Sym) {
> > + M.fuzzyFind(Req, [&](const Symbol &Sym) {
> > if (Sym.Name == "vector") {
> > EXPECT_EQ(Sym.Signature, "<class Ty>");
> > EXPECT_EQ(Sym.CompletionSnippetSuffix, "<${1:class Ty}>");
> > @@ -324,7 +324,7 @@ TEST(FileIndexTest, Refs) {
> > AST = Test2.build();
> > Index.updateMain(Test2.Filename, AST);
> >
> > - EXPECT_THAT(getRefs(Index.index(), Foo.ID),
> > + EXPECT_THAT(getRefs(Index, Foo.ID),
> > RefsAre({AllOf(RefRange(MainCode.range("foo")),
> > FileURI("unittest:///test.cc")),
> > AllOf(RefRange(MainCode.range("foo")),
> > @@ -338,7 +338,7 @@ TEST(FileIndexTest, CollectMacros) {
> > FuzzyFindRequest Req;
> > Req.Query = "";
> > bool SeenSymbol = false;
> > - M.index().fuzzyFind(Req, [&](const Symbol &Sym) {
> > + M.fuzzyFind(Req, [&](const Symbol &Sym) {
> > EXPECT_EQ(Sym.Name, "CLANGD");
> > EXPECT_EQ(Sym.SymInfo.Kind, index::SymbolKind::Macro);
> > SeenSymbol = true;
> >
> > Modified: clang-tools-extra/trunk/unittests/clangd/IndexTests.cpp
> > URL: http://llvm.org/viewvc/llvm-project/clang-tools-
> > extra/trunk/unittests/clangd/IndexTests.cpp?rev=343780&r1=343779&r2=343
> > 780&view=diff
> > =======================================================================
> > =======
> > --- clang-tools-extra/trunk/unittests/clangd/IndexTests.cpp (original)
> > +++ clang-tools-extra/trunk/unittests/clangd/IndexTests.cpp Thu Oct 4
> > 07:20:22 2018
> > @@ -161,16 +161,16 @@ TEST(MemIndexTest, Lookup) {
> > TEST(MergeIndexTest, Lookup) {
> > auto I = MemIndex::build(generateSymbols({"ns::A", "ns::B"}),
> > RefSlab()),
> > J = MemIndex::build(generateSymbols({"ns::B", "ns::C"}),
> > RefSlab());
> > - auto M = mergeIndex(I.get(), J.get());
> > - EXPECT_THAT(lookup(*M, SymbolID("ns::A")),
> > UnorderedElementsAre("ns::A"));
> > - EXPECT_THAT(lookup(*M, SymbolID("ns::B")),
> > UnorderedElementsAre("ns::B"));
> > - EXPECT_THAT(lookup(*M, SymbolID("ns::C")),
> > UnorderedElementsAre("ns::C"));
> > - EXPECT_THAT(lookup(*M, {SymbolID("ns::A"), SymbolID("ns::B")}),
> > + MergedIndex M(I.get(), J.get());
> > + EXPECT_THAT(lookup(M, SymbolID("ns::A")),
> > UnorderedElementsAre("ns::A"));
> > + EXPECT_THAT(lookup(M, SymbolID("ns::B")),
> > UnorderedElementsAre("ns::B"));
> > + EXPECT_THAT(lookup(M, SymbolID("ns::C")),
> > UnorderedElementsAre("ns::C"));
> > + EXPECT_THAT(lookup(M, {SymbolID("ns::A"), SymbolID("ns::B")}),
> > UnorderedElementsAre("ns::A", "ns::B"));
> > - EXPECT_THAT(lookup(*M, {SymbolID("ns::A"), SymbolID("ns::C")}),
> > + EXPECT_THAT(lookup(M, {SymbolID("ns::A"), SymbolID("ns::C")}),
> > UnorderedElementsAre("ns::A", "ns::C"));
> > - EXPECT_THAT(lookup(*M, SymbolID("ns::D")), UnorderedElementsAre());
> > - EXPECT_THAT(lookup(*M, {}), UnorderedElementsAre());
> > + EXPECT_THAT(lookup(M, SymbolID("ns::D")), UnorderedElementsAre());
> > + EXPECT_THAT(lookup(M, {}), UnorderedElementsAre());
> > }
> >
> > TEST(MergeIndexTest, FuzzyFind) {
> > @@ -178,7 +178,7 @@ TEST(MergeIndexTest, FuzzyFind) {
> > J = MemIndex::build(generateSymbols({"ns::B", "ns::C"}),
> > RefSlab());
> > FuzzyFindRequest Req;
> > Req.Scopes = {"ns::"};
> > - EXPECT_THAT(match(*mergeIndex(I.get(), J.get()), Req),
> > + EXPECT_THAT(match(MergedIndex(I.get(), J.get()), Req),
> > UnorderedElementsAre("ns::A", "ns::B", "ns::C"));
> > }
> >
> > @@ -231,7 +231,7 @@ TEST(MergeTest, PreferSymbolWithDefn) {
> > TEST(MergeIndexTest, Refs) {
> > FileIndex Dyn({"unittest"});
> > FileIndex StaticIndex({"unittest"});
> > - auto MergedIndex = mergeIndex(&Dyn.index(), &StaticIndex.index());
> > + MergedIndex Merge(&Dyn, &StaticIndex);
> >
> > const char *HeaderCode = "class Foo;";
> > auto HeaderSymbols = TestTU::withHeaderCode("class
> > Foo;").headerSymbols();
> > @@ -266,7 +266,7 @@ TEST(MergeIndexTest, Refs) {
> > RefsRequest Request;
> > Request.IDs = {Foo.ID};
> > RefSlab::Builder Results;
> > - MergedIndex->refs(Request, [&](const Ref &O) {
> > Results.insert(Foo.ID, O); });
> > + Merge.refs(Request, [&](const Ref &O) { Results.insert(Foo.ID, O);
> > });
> >
> > EXPECT_THAT(
> > std::move(Results).build(),
> >
> > Modified: clang-tools-extra/trunk/unittests/clangd/TestTU.cpp
> > URL: http://llvm.org/viewvc/llvm-project/clang-tools-
> > extra/trunk/unittests/clangd/TestTU.cpp?rev=343780&r1=343779&r2=343780&
> > view=diff
> > =======================================================================
> > =======
> > --- clang-tools-extra/trunk/unittests/clangd/TestTU.cpp (original)
> > +++ clang-tools-extra/trunk/unittests/clangd/TestTU.cpp Thu Oct 4
> > 07:20:22 2018
> > @@ -48,11 +48,12 @@ SymbolSlab TestTU::headerSymbols() const
> > return indexHeaderSymbols(AST.getASTContext(),
> > AST.getPreprocessorPtr());
> > }
> >
> > -// FIXME: This should return a FileIndex with both preamble and main
> > index.
> > std::unique_ptr<SymbolIndex> TestTU::index() const {
> > auto AST = build();
> > - auto Content = indexMainDecls(AST);
> > - return MemIndex::build(std::move(Content.first),
> > std::move(Content.second));
> > + auto Idx = llvm::make_unique<FileIndex>();
> > + Idx->updatePreamble(Filename, AST.getASTContext(),
> > AST.getPreprocessorPtr());
> > + Idx->updateMain(Filename, AST);
> > + return Idx;
> > }
> >
> > const Symbol &findSymbol(const SymbolSlab &Slab, llvm::StringRef
> > QName) {
> >
> >
> > _______________________________________________
> > cfe-commits mailing list
> > cfe-commits at lists.llvm.org
> > http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20181004/abc29f97/attachment-0001.html>
More information about the cfe-commits
mailing list