maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

[clangd] Use URIs instead of paths in the index file list 

Without this patch the file list of the preamble index contains URIs, but other indexes file lists contain file paths.
This makes `indexedFiles()` always returns `IndexContents::None` for the preamble index, because current implementation expects file paths inside the file list of the index.

This patch fixes this problem and also helps to avoid a lot of URI to path conversions during indexes merge.

Reviewed By: kadircet

Differential Revision: https://reviews.llvm.org/D97535
This commit is contained in:
Aleksandr Platonov 2021-03-06 10:44:05 +03:00
parent 714644a36c
commit c4efd04f18
8 changed files with 19 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
clang-tools-extra/clangd/index/Background.cpp
View File

@ -243,7 +243,7 @@ void BackgroundIndex::update(
// this thread sees the older version but finishes later. This should be
// rare in practice.
IndexedSymbols.update(
Path, std::make_unique<SymbolSlab>(std::move(*IF->Symbols)),
Uri, std::make_unique<SymbolSlab>(std::move(*IF->Symbols)),
std::make_unique<RefSlab>(std::move(*IF->Refs)),
std::make_unique<RelationSlab>(std::move(*IF->Relations)),
Path == MainFile);
@ -390,8 +390,9 @@ BackgroundIndex::loadProject(std::vector<std::string> MainFiles) {
SV.HadErrors = LS.HadErrors;
++LoadedShards;
IndexedSymbols.update(LS.AbsolutePath, std::move(SS), std::move(RS),
std::move(RelS), LS.CountReferences);
IndexedSymbols.update(URI::create(LS.AbsolutePath).toString(),
std::move(SS), std::move(RS), std::move(RelS),
LS.CountReferences);
}
}
Rebuilder.loadedShard(LoadedShards);

3
clang-tools-extra/clangd/index/FileIndex.cpp
View File

@ -463,7 +463,8 @@ void FileIndex::updatePreamble(PathRef Path, llvm::StringRef Version,
void FileIndex::updateMain(PathRef Path, ParsedAST &AST) {
auto Contents = indexMainDecls(AST);
MainFileSymbols.update(
Path, std::make_unique<SymbolSlab>(std::move(std::get<0>(Contents))),
URI::create(Path).toString(),
std::make_unique<SymbolSlab>(std::move(std::get<0>(Contents))),
std::make_unique<RefSlab>(std::move(std::get<1>(Contents))),
std::make_unique<RelationSlab>(std::move(std::get<2>(Contents))),
/*CountReferences=*/true);

9
clang-tools-extra/clangd/index/MemIndex.cpp
View File

@ -112,14 +112,7 @@ void MemIndex::relations(
llvm::unique_function<IndexContents(llvm::StringRef) const>
MemIndex::indexedFiles() const {
return [this](llvm::StringRef FileURI) {
if (Files.empty())
return IndexContents::None;
auto Path = URI::resolve(FileURI, Files.begin()->first());
if (!Path) {
vlog("Failed to resolve the URI {0} : {1}", FileURI, Path.takeError());
return IndexContents::None;
}
return Files.contains(*Path) ? IdxContents : IndexContents::None;
return Files.contains(FileURI) ? IdxContents : IndexContents::None;
};
}

9
clang-tools-extra/clangd/index/dex/Dex.cpp
View File

@ -316,14 +316,7 @@ void Dex::relations(
llvm::unique_function<IndexContents(llvm::StringRef) const>
Dex::indexedFiles() const {
return [this](llvm::StringRef FileURI) {
if (Files.empty())
return IndexContents::None;
auto Path = URI::resolve(FileURI, Files.begin()->first());
if (!Path) {
vlog("Failed to resolve the URI {0} : {1}", FileURI, Path.takeError());
return IndexContents::None;
}
return Files.contains(*Path) ? IdxContents : IndexContents::None;
return Files.contains(FileURI) ? IdxContents : IndexContents::None;
};
}

8
clang-tools-extra/clangd/test/memory_tree.test
View File

@ -23,7 +23,9 @@
# CHECK-NEXT: "_total": {{[0-9]+}}
# CHECK-NEXT: },
# CHECK-NEXT: "slabs": {
# CHECK-NEXT: "{{.*}}main.cpp": {
# CHECK-NEXT: "_self": {{[0-9]+}},
# CHECK-NEXT: "_total": {{[0-9]+}},
# CHECK-NEXT: "test:///main.cpp": {
# CHECK-NEXT: "_self": {{[0-9]+}},
# CHECK-NEXT: "_total": {{[0-9]+}},
# CHECK-NEXT: "references": {
@ -38,9 +40,7 @@
# CHECK-NEXT: "_self": {{[0-9]+}},
# CHECK-NEXT: "_total": {{[0-9]+}}
# CHECK-NEXT: }
# CHECK-NEXT: },
# CHECK-NEXT: "_self": {{[0-9]+}},
# CHECK-NEXT: "_total": {{[0-9]+}}
# CHECK-NEXT: }
# CHECK-NEXT: }
# CHECK-NEXT: },
# CHECK-NEXT: "preamble": {

2
clang-tools-extra/clangd/unittests/DexTests.cpp
View File

@ -737,7 +737,7 @@ TEST(DexIndex, IndexedFiles) {
RefSlab Refs;
auto Size = Symbols.bytes() + Refs.bytes();
auto Data = std::make_pair(std::move(Symbols), std::move(Refs));
llvm::StringSet<> Files = {testPath("foo.cc"), testPath("bar.cc")};
llvm::StringSet<> Files = {"unittest:///foo.cc", "unittest:///bar.cc"};
Dex I(std::move(Data.first), std::move(Data.second), RelationSlab(),
std::move(Files), IndexContents::All, std::move(Data), Size);
auto ContainsFile = I.indexedFiles();

6
clang-tools-extra/clangd/unittests/FileIndexTests.cpp
View File

@ -352,14 +352,14 @@ TEST(FileIndexTest, Refs) {
Test.Code = std::string(MainCode.code());
Test.Filename = "test.cc";
auto AST = Test.build();
Index.updateMain(Test.Filename, AST);
Index.updateMain(testPath(Test.Filename), AST);
// Add test2.cc
TestTU Test2;
Test2.HeaderCode = HeaderCode;
Test2.Code = std::string(MainCode.code());
Test2.Filename = "test2.cc";
AST = Test2.build();
Index.updateMain(Test2.Filename, AST);
Index.updateMain(testPath(Test2.Filename), AST);
EXPECT_THAT(getRefs(Index, Foo.ID),
RefsAre({AllOf(RefRange(MainCode.range("foo")),
@ -387,7 +387,7 @@ TEST(FileIndexTest, MacroRefs) {
Test.Code = std::string(MainCode.code());
Test.Filename = "test.cc";
auto AST = Test.build();
Index.updateMain(Test.Filename, AST);
Index.updateMain(testPath(Test.Filename), AST);
auto HeaderMacro = findSymbol(Test.headerSymbols(), "HEADER_MACRO");
EXPECT_THAT(getRefs(Index, HeaderMacro.ID),

6
clang-tools-extra/clangd/unittests/IndexTests.cpp
View File

@ -229,7 +229,7 @@ TEST(MemIndexTest, IndexedFiles) {
RefSlab Refs;
auto Size = Symbols.bytes() + Refs.bytes();
auto Data = std::make_pair(std::move(Symbols), std::move(Refs));
llvm::StringSet<> Files = {testPath("foo.cc"), testPath("bar.cc")};
llvm::StringSet<> Files = {"unittest:///foo.cc", "unittest:///bar.cc"};
MemIndex I(std::move(Data.first), std::move(Data.second), RelationSlab(),
std::move(Files), IndexContents::All, std::move(Data), Size);
auto ContainsFile = I.indexedFiles();
@ -506,7 +506,7 @@ TEST(MergeIndexTest, IndexedFiles) {
RefSlab DynRefs;
auto DynSize = DynSymbols.bytes() + DynRefs.bytes();
auto DynData = std::make_pair(std::move(DynSymbols), std::move(DynRefs));
llvm::StringSet<> DynFiles = {testPath("foo.cc")};
llvm::StringSet<> DynFiles = {"unittest:///foo.cc"};
MemIndex DynIndex(std::move(DynData.first), std::move(DynData.second),
RelationSlab(), std::move(DynFiles), IndexContents::Symbols,
std::move(DynData), DynSize);
@ -514,7 +514,7 @@ TEST(MergeIndexTest, IndexedFiles) {
RefSlab StaticRefs;
auto StaticData =
std::make_pair(std::move(StaticSymbols), std::move(StaticRefs));
llvm::StringSet<> StaticFiles = {testPath("foo.cc"), testPath("bar.cc")};
llvm::StringSet<> StaticFiles = {"unittest:///foo.cc", "unittest:///bar.cc"};
MemIndex StaticIndex(
std::move(StaticData.first), std::move(StaticData.second), RelationSlab(),
std::move(StaticFiles), IndexContents::References, std::move(StaticData),