kadircet updated this revision to Diff 260878.
kadircet added a comment.
- Return None and change PathRef to auto since it is URI now.
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D79079/new/
https://reviews.llvm.org/D79079
Files:
clang-tools-extra/clangd/index/Background.cpp
clang-tools-extra/clangd/index/FileIndex.cpp
clang-tools-extra/clangd/index/FileIndex.h
clang-tools-extra/clangd/unittests/FileIndexTests.cpp
Index: clang-tools-extra/clangd/unittests/FileIndexTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/FileIndexTests.cpp
+++ clang-tools-extra/clangd/unittests/FileIndexTests.cpp
@@ -568,13 +568,12 @@
IF.Cmd = tooling::CompileCommand(testRoot(), "b.cc", {"clang"}, "out");
- FileShardedIndex ShardedIndex(std::move(IF), testPath("b.cc"));
- ASSERT_THAT(
- ShardedIndex.getAllFiles(),
- UnorderedElementsAre(testPath("a.h"), testPath("b.h"), testPath("b.cc")));
+ FileShardedIndex ShardedIndex(std::move(IF));
+ ASSERT_THAT(ShardedIndex.getAllSources(),
+ UnorderedElementsAre(AHeaderUri, BHeaderUri, BSourceUri));
{
- auto Shard = ShardedIndex.getShard(testPath("a.h"));
+ auto Shard = ShardedIndex.getShard(AHeaderUri).getValue();
EXPECT_THAT(Shard.Symbols.getValue(), UnorderedElementsAre(QName("1")));
EXPECT_THAT(Shard.Refs.getValue(), IsEmpty());
EXPECT_THAT(
@@ -586,7 +585,7 @@
EXPECT_TRUE(Shard.Cmd.hasValue());
}
{
- auto Shard = ShardedIndex.getShard(testPath("b.h"));
+ auto Shard = ShardedIndex.getShard(BHeaderUri).getValue();
EXPECT_THAT(Shard.Symbols.getValue(), UnorderedElementsAre(QName("2")));
EXPECT_THAT(Shard.Refs.getValue(), IsEmpty());
EXPECT_THAT(
@@ -599,7 +598,7 @@
EXPECT_TRUE(Shard.Cmd.hasValue());
}
{
- auto Shard = ShardedIndex.getShard(testPath("b.cc"));
+ auto Shard = ShardedIndex.getShard(BSourceUri).getValue();
EXPECT_THAT(Shard.Symbols.getValue(), UnorderedElementsAre(QName("2")));
EXPECT_THAT(Shard.Refs.getValue(), UnorderedElementsAre(Pair(Sym1.ID, _)));
EXPECT_THAT(Shard.Relations.getValue(), IsEmpty());
Index: clang-tools-extra/clangd/index/FileIndex.h
===================================================================
--- clang-tools-extra/clangd/index/FileIndex.h
+++ clang-tools-extra/clangd/index/FileIndex.h
@@ -159,16 +159,16 @@
struct FileShardedIndex {
/// \p HintPath is used to convert file URIs stored in symbols into absolute
/// paths.
- explicit FileShardedIndex(IndexFileIn Input, PathRef HintPath);
+ explicit FileShardedIndex(IndexFileIn Input);
- /// Returns absolute paths for all files that has a shard.
- std::vector<PathRef> getAllFiles() const;
+ /// Returns uris for all files that has a shard.
+ std::vector<llvm::StringRef> getAllSources() const;
- /// Generates index shard for the \p File. Note that this function results in
+ /// Generates index shard for the \p Uri. Note that this function results in
/// a copy of all the relevant data.
/// Returned index will always have Symbol/Refs/Relation Slabs set, even if
/// they are empty.
- IndexFileIn getShard(PathRef File) const;
+ llvm::Optional<IndexFileIn> getShard(llvm::StringRef Uri) const;
private:
// Contains all the information that belongs to a single file.
@@ -185,7 +185,7 @@
// Keeps all the information alive.
const IndexFileIn Index;
- // Mapping from absolute paths to slab information.
+ // Mapping from URIs to slab information.
llvm::StringMap<FileShard> Shards;
// Used to build RefSlabs.
llvm::DenseMap<const Ref *, SymbolID> RefToSymID;
Index: clang-tools-extra/clangd/index/FileIndex.cpp
===================================================================
--- clang-tools-extra/clangd/index/FileIndex.cpp
+++ clang-tools-extra/clangd/index/FileIndex.cpp
@@ -29,6 +29,7 @@
#include "clang/Lex/MacroInfo.h"
#include "clang/Lex/Preprocessor.h"
#include "llvm/ADT/DenseMap.h"
+#include "llvm/ADT/Optional.h"
#include "llvm/ADT/STLExtras.h"
#include "llvm/ADT/StringMap.h"
#include "llvm/ADT/StringRef.h"
@@ -96,27 +97,6 @@
std::move(Relations));
}
-// Resolves URI to file paths with cache.
-class URIToFileCache {
-public:
- URIToFileCache(PathRef HintPath) : HintPath(HintPath) {}
-
- llvm::StringRef operator[](llvm::StringRef FileURI) {
- if (FileURI.empty())
- return "";
- auto I = URIToPathCache.try_emplace(FileURI);
- if (I.second) {
- I.first->second = llvm::cantFail(URI::resolve(FileURI, HintPath),
- "Failed to resolve URI");
- }
- return I.first->second;
- }
-
-private:
- PathRef HintPath;
- llvm::StringMap<std::string> URIToPathCache;
-};
-
// We keep only the node "U" and its edges. Any node other than "U" will be
// empty in the resultant graph.
IncludeGraph getSubGraph(llvm::StringRef URI, const IncludeGraph &FullGraph) {
@@ -137,24 +117,21 @@
}
} // namespace
-FileShardedIndex::FileShardedIndex(IndexFileIn Input, PathRef HintPath)
+FileShardedIndex::FileShardedIndex(IndexFileIn Input)
: Index(std::move(Input)) {
- URIToFileCache UriToFile(HintPath);
// Used to build RelationSlabs.
llvm::DenseMap<SymbolID, FileShard *> SymbolIDToFile;
// Attribute each Symbol to both their declaration and definition locations.
if (Index.Symbols) {
for (const auto &S : *Index.Symbols) {
- auto File = UriToFile[S.CanonicalDeclaration.FileURI];
- auto It = Shards.try_emplace(File);
+ auto It = Shards.try_emplace(S.CanonicalDeclaration.FileURI);
It.first->getValue().Symbols.insert(&S);
SymbolIDToFile[S.ID] = &It.first->getValue();
// Only bother if definition file is different than declaration file.
if (S.Definition &&
S.Definition.FileURI != S.CanonicalDeclaration.FileURI) {
- auto File = UriToFile[S.Definition.FileURI];
- auto It = Shards.try_emplace(File);
+ auto It = Shards.try_emplace(S.Definition.FileURI);
It.first->getValue().Symbols.insert(&S);
}
}
@@ -163,8 +140,7 @@
if (Index.Refs) {
for (const auto &SymRefs : *Index.Refs) {
for (const auto &R : SymRefs.second) {
- auto File = UriToFile[R.Location.FileURI];
- const auto It = Shards.try_emplace(File);
+ const auto It = Shards.try_emplace(R.Location.FileURI);
It.first->getValue().Refs.insert(&R);
RefToSymID[&R] = SymRefs.first;
}
@@ -183,25 +159,26 @@
if (Index.Sources) {
const auto &FullGraph = *Index.Sources;
for (const auto &It : FullGraph) {
- auto File = UriToFile[It.first()];
- auto ShardIt = Shards.try_emplace(File);
+ auto ShardIt = Shards.try_emplace(It.first());
ShardIt.first->getValue().IG = getSubGraph(It.first(), FullGraph);
}
}
}
-std::vector<PathRef> FileShardedIndex::getAllFiles() const {
+std::vector<llvm::StringRef> FileShardedIndex::getAllSources() const {
// It should be enough to construct a vector with {Shards.keys().begin(),
// Shards.keys().end()} but MSVC fails to compile that.
std::vector<PathRef> Result;
Result.reserve(Shards.size());
- for (PathRef Key : Shards.keys())
+ for (auto Key : Shards.keys())
Result.push_back(Key);
return Result;
}
-IndexFileIn FileShardedIndex::getShard(PathRef File) const {
- auto It = Shards.find(File);
- assert(It != Shards.end() && "received unknown file");
+llvm::Optional<IndexFileIn>
+FileShardedIndex::getShard(llvm::StringRef Uri) const {
+ auto It = Shards.find(Uri);
+ if (It == Shards.end())
+ return llvm::None;
IndexFileIn IF;
IF.Sources = It->getValue().IG;
@@ -399,11 +376,18 @@
IndexFileIn IF;
std::tie(IF.Symbols, std::ignore, IF.Relations) =
indexHeaderSymbols(Version, AST, std::move(PP), Includes);
- FileShardedIndex ShardedIndex(std::move(IF), Path);
- for (PathRef File : ShardedIndex.getAllFiles()) {
- auto IF = ShardedIndex.getShard(File);
+ FileShardedIndex ShardedIndex(std::move(IF));
+ for (auto Uri : ShardedIndex.getAllSources()) {
+ auto AbsPath = URI::resolve(Uri, Path);
+ if (!AbsPath) {
+ elog("Failed to resolve uri: {0}", AbsPath.takeError());
+ continue;
+ }
+ // We are using the key received from ShardedIndex, so it should always
+ // exist.
+ auto IF = ShardedIndex.getShard(Uri).getValue();
PreambleSymbols.update(
- File, std::make_unique<SymbolSlab>(std::move(*IF.Symbols)),
+ *AbsPath, std::make_unique<SymbolSlab>(std::move(*IF.Symbols)),
std::make_unique<RefSlab>(),
std::make_unique<RelationSlab>(std::move(*IF.Relations)),
/*CountReferences=*/false);
Index: clang-tools-extra/clangd/index/Background.cpp
===================================================================
--- clang-tools-extra/clangd/index/Background.cpp
+++ clang-tools-extra/clangd/index/Background.cpp
@@ -174,28 +174,36 @@
llvm::StringRef MainFile, IndexFileIn Index,
const llvm::StringMap<ShardVersion> &ShardVersionsSnapshot,
bool HadErrors) {
- llvm::StringMap<FileDigest> FilesToUpdate;
+ // Keys are URIs.
+ llvm::StringMap<std::pair<Path, FileDigest>> FilesToUpdate;
+ // Note that sources do not contain any information regarding missing headers,
+ // since we don't even know what absolute path they should fall in.
for (const auto &IndexIt : *Index.Sources) {
const auto &IGN = IndexIt.getValue();
// Note that sources do not contain any information regarding missing
// headers, since we don't even know what absolute path they should fall in.
- auto AbsPath = llvm::cantFail(URI::resolve(IGN.URI, MainFile),
- "Failed to resovle URI");
- const auto DigestIt = ShardVersionsSnapshot.find(AbsPath);
+ auto AbsPath = URI::resolve(IGN.URI, MainFile);
+ if (!AbsPath) {
+ elog("Failed to resolve URI: {0}", AbsPath.takeError());
+ continue;
+ }
+ const auto DigestIt = ShardVersionsSnapshot.find(*AbsPath);
// File has different contents, or indexing was successful this time.
if (DigestIt == ShardVersionsSnapshot.end() ||
DigestIt->getValue().Digest != IGN.Digest ||
(DigestIt->getValue().HadErrors && !HadErrors))
- FilesToUpdate[AbsPath] = IGN.Digest;
+ FilesToUpdate[IGN.URI] = {std::move(*AbsPath), IGN.Digest};
}
// Shard slabs into files.
- FileShardedIndex ShardedIndex(std::move(Index), MainFile);
+ FileShardedIndex ShardedIndex(std::move(Index));
// Build and store new slabs for each updated file.
for (const auto &FileIt : FilesToUpdate) {
- PathRef Path = FileIt.first();
- auto IF = ShardedIndex.getShard(Path);
+ auto Uri = FileIt.first();
+ // ShardedIndex should always have a shard for a file in Index.Sources.
+ auto IF = ShardedIndex.getShard(Uri).getValue();
+ PathRef Path = FileIt.getValue().first;
// Only store command line hash for main files of the TU, since our
// current model keeps only one version of a header file.
@@ -211,7 +219,7 @@
{
std::lock_guard<std::mutex> Lock(ShardVersionsMu);
- const auto &Hash = FileIt.getValue();
+ const auto &Hash = FileIt.getValue().second;
auto DigestIt = ShardVersions.try_emplace(Path);
ShardVersion &SV = DigestIt.first->second;
// Skip if file is already up to date, unless previous index was broken
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
