nridge updated this revision to Diff 300518.
nridge added a comment.
Use Decl rather than NamedDecl, and add a test
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D89670/new/
https://reviews.llvm.org/D89670
Files:
clang-tools-extra/clangd/index/Ref.h
clang-tools-extra/clangd/index/Serialization.cpp
clang-tools-extra/clangd/index/SymbolCollector.cpp
clang-tools-extra/clangd/index/SymbolCollector.h
clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp
Index: clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp
+++ clang-tools-extra/clangd/unittests/SymbolCollectorTests.cpp
@@ -70,21 +70,16 @@
MATCHER_P2(IncludeHeaderWithRef, IncludeHeader, References, "") {
return (arg.IncludeHeader == IncludeHeader) && (arg.References == References);
}
+bool rangesMatch(const SymbolLocation &Loc, const Range &R) {
+ return std::make_tuple(Loc.Start.line(), Loc.Start.column(), Loc.End.line(),
+ Loc.End.column()) ==
+ std::make_tuple(R.start.line, R.start.character, R.end.line,
+ R.end.character);
+}
MATCHER_P(DeclRange, Pos, "") {
- return std::make_tuple(arg.CanonicalDeclaration.Start.line(),
- arg.CanonicalDeclaration.Start.column(),
- arg.CanonicalDeclaration.End.line(),
- arg.CanonicalDeclaration.End.column()) ==
- std::make_tuple(Pos.start.line, Pos.start.character, Pos.end.line,
- Pos.end.character);
-}
-MATCHER_P(DefRange, Pos, "") {
- return std::make_tuple(
- arg.Definition.Start.line(), arg.Definition.Start.column(),
- arg.Definition.End.line(), arg.Definition.End.column()) ==
- std::make_tuple(Pos.start.line, Pos.start.character, Pos.end.line,
- Pos.end.character);
+ return rangesMatch(arg.CanonicalDeclaration, Pos);
}
+MATCHER_P(DefRange, Pos, "") { return rangesMatch(arg.Definition, Pos); }
MATCHER_P(RefCount, R, "") { return int(arg.References) == R; }
MATCHER_P(ForCodeCompletion, IsIndexedForCodeCompletion, "") {
return static_cast<bool>(arg.Flags & Symbol::IndexedForCodeCompletion) ==
@@ -100,10 +95,7 @@
MATCHER(RefRange, "") {
const Ref &Pos = ::testing::get<0>(arg);
const Range &Range = ::testing::get<1>(arg);
- return std::make_tuple(Pos.Location.Start.line(), Pos.Location.Start.column(),
- Pos.Location.End.line(), Pos.Location.End.column()) ==
- std::make_tuple(Range.start.line, Range.start.character,
- Range.end.line, Range.end.character);
+ return rangesMatch(Pos.Location, Range);
}
::testing::Matcher<const std::vector<Ref> &>
HaveRanges(const std::vector<Range> Ranges) {
@@ -738,6 +730,54 @@
EXPECT_THAT(Refs, Not(Contains(Pair(findSymbol(Symbols, "FUNC").ID, _))));
}
+TEST_F(SymbolCollectorTest, RefContainers) {
+ Annotations Code(R"cpp(
+ int f1(int);
+ void f2() {
+ (void) $ref1a[[f1]](1);
+ auto fptr = &$ref1b[[f1]];
+ }
+ int v1 = $ref2[[f1]](2);
+ void f3(int arg = $ref3[[f1]](3));
+ struct S1 {
+ int member = $ref4[[f1]](4);
+ };
+ constexpr int f4(int x) { return x + 1; }
+ template <int I = $ref5[[f4]](0)> struct S2 {};
+ S2<$ref6[[f4]](0)> v2;
+ S2<$ref7a[[f4]](0)> f5(S2<$ref7b[[f4]](0)>);
+ )cpp");
+ CollectorOpts.RefFilter = RefKind::All;
+ CollectorOpts.CollectMainFileRefs = true;
+ runSymbolCollector("", Code.code());
+ auto FindRefWithRange = [&](Range R) -> Optional<Ref> {
+ for (auto &Entry : Refs) {
+ for (auto &Ref : Entry.second) {
+ if (rangesMatch(Ref.Location, R))
+ return Ref;
+ }
+ }
+ return llvm::None;
+ };
+ auto AssertContainer = [&](llvm::StringRef RefAnnotation,
+ llvm::StringRef ExpectedContainerName) {
+ auto Ref = FindRefWithRange(Code.range(RefAnnotation));
+ EXPECT_TRUE(bool(Ref));
+
+ auto ExpectedContainer = findSymbol(Symbols, ExpectedContainerName);
+ EXPECT_EQ(Ref->Container, ExpectedContainer.ID);
+ };
+ AssertContainer("ref1a", "f2"); // function body (call)
+ AssertContainer("ref1b", "f2"); // function body (address-of)
+ AssertContainer("ref2", "v1"); // variable initializer
+ AssertContainer("ref3", "f3"); // function parameter default value
+ AssertContainer("ref4", "S1::member"); // member initializer
+ AssertContainer("ref5", "S2"); // template parameter default value
+ AssertContainer("ref6", "v2"); // type of variable
+ AssertContainer("ref7a", "f5"); // return type of function
+ AssertContainer("ref7b", "f5"); // parameter type of function
+}
+
TEST_F(SymbolCollectorTest, MacroRefInHeader) {
Annotations Header(R"(
#define $foo[[FOO]](X) (X + 1)
Index: clang-tools-extra/clangd/index/SymbolCollector.h
===================================================================
--- clang-tools-extra/clangd/index/SymbolCollector.h
+++ clang-tools-extra/clangd/index/SymbolCollector.h
@@ -156,7 +156,11 @@
std::shared_ptr<GlobalCodeCompletionAllocator> CompletionAllocator;
std::unique_ptr<CodeCompletionTUInfo> CompletionTUInfo;
Options Opts;
- using SymbolRef = std::pair<SourceLocation, index::SymbolRoleSet>;
+ struct SymbolRef {
+ SourceLocation Loc;
+ index::SymbolRoleSet Roles;
+ const Decl *Container;
+ };
// Symbols referenced from the current TU, flushed on finish().
llvm::DenseSet<const NamedDecl *> ReferencedDecls;
llvm::DenseSet<const IdentifierInfo *> ReferencedMacros;
Index: clang-tools-extra/clangd/index/SymbolCollector.cpp
===================================================================
--- clang-tools-extra/clangd/index/SymbolCollector.cpp
+++ clang-tools-extra/clangd/index/SymbolCollector.cpp
@@ -344,7 +344,8 @@
!isa<NamespaceDecl>(ND) &&
(Opts.RefsInHeaders ||
SM.getFileID(SM.getFileLoc(Loc)) == SM.getMainFileID()))
- DeclRefs[ND].emplace_back(SM.getFileLoc(Loc), Roles);
+ DeclRefs[ND].push_back(
+ SymbolRef{SM.getFileLoc(Loc), Roles, ASTNode.Parent});
// Don't continue indexing if this is a mere reference.
if (IsOnlyRef)
return true;
@@ -422,7 +423,8 @@
// Do not store references to main-file macros.
if ((static_cast<unsigned>(Opts.RefFilter) & Roles) && !IsMainFileOnly &&
(Opts.RefsInHeaders || SM.getFileID(SpellingLoc) == SM.getMainFileID()))
- MacroRefs[*ID].push_back({Loc, Roles});
+ // FIXME: Populate container information for macro references.
+ MacroRefs[*ID].push_back({Loc, Roles, /*Container=*/nullptr});
// Collect symbols.
if (!Opts.CollectMacro)
@@ -579,24 +581,23 @@
}
return Found->second;
};
- auto CollectRef =
- [&](SymbolID ID,
- const std::pair<SourceLocation, index::SymbolRoleSet> &LocAndRole,
- bool Spelled = false) {
- auto FileID = SM.getFileID(LocAndRole.first);
- // FIXME: use the result to filter out references.
- shouldIndexFile(FileID);
- if (auto FileURI = GetURI(FileID)) {
- auto Range =
- getTokenRange(LocAndRole.first, SM, ASTCtx->getLangOpts());
- Ref R;
- R.Location.Start = Range.first;
- R.Location.End = Range.second;
- R.Location.FileURI = FileURI->c_str();
- R.Kind = toRefKind(LocAndRole.second, Spelled);
- Refs.insert(ID, R);
- }
- };
+ auto CollectRef = [&](SymbolID ID, const SymbolRef &LocAndRole,
+ bool Spelled = false) {
+ auto FileID = SM.getFileID(LocAndRole.Loc);
+ // FIXME: use the result to filter out references.
+ shouldIndexFile(FileID);
+ if (auto FileURI = GetURI(FileID)) {
+ auto Range = getTokenRange(LocAndRole.Loc, SM, ASTCtx->getLangOpts());
+ Ref R;
+ R.Location.Start = Range.first;
+ R.Location.End = Range.second;
+ R.Location.FileURI = FileURI->c_str();
+ R.Kind = toRefKind(LocAndRole.Roles, Spelled);
+ if (auto RefID = getSymbolID(LocAndRole.Container))
+ R.Container = *RefID;
+ Refs.insert(ID, R);
+ }
+ };
// Populate Refs slab from MacroRefs.
// FIXME: All MacroRefs are marked as Spelled now, but this should be checked.
for (const auto &IDAndRefs : MacroRefs)
@@ -607,7 +608,7 @@
for (auto &DeclAndRef : DeclRefs) {
if (auto ID = getSymbolID(DeclAndRef.first)) {
for (auto &LocAndRole : DeclAndRef.second) {
- const auto FileID = SM.getFileID(LocAndRole.first);
+ const auto FileID = SM.getFileID(LocAndRole.Loc);
// FIXME: It's better to use TokenBuffer by passing spelled tokens from
// the caller of SymbolCollector.
if (!FilesToTokensCache.count(FileID))
@@ -617,7 +618,7 @@
// Check if the referenced symbol is spelled exactly the same way the
// corresponding NamedDecl is. If it is, mark this reference as spelled.
const auto *IdentifierToken =
- spelledIdentifierTouching(LocAndRole.first, Tokens);
+ spelledIdentifierTouching(LocAndRole.Loc, Tokens);
DeclarationName Name = DeclAndRef.first->getDeclName();
const auto NameKind = Name.getNameKind();
bool IsTargetKind = NameKind == DeclarationName::Identifier ||
Index: clang-tools-extra/clangd/index/Serialization.cpp
===================================================================
--- clang-tools-extra/clangd/index/Serialization.cpp
+++ clang-tools-extra/clangd/index/Serialization.cpp
@@ -345,6 +345,7 @@
for (const auto &Ref : Refs) {
OS.write(static_cast<unsigned char>(Ref.Kind));
writeLocation(Ref.Location, Strings, OS);
+ OS << Ref.Container.raw();
}
}
@@ -356,6 +357,7 @@
for (auto &Ref : Result.second) {
Ref.Kind = static_cast<RefKind>(Data.consume8());
Ref.Location = readLocation(Data, Strings);
+ Ref.Container = Data.consumeID();
}
return Result;
}
Index: clang-tools-extra/clangd/index/Ref.h
===================================================================
--- clang-tools-extra/clangd/index/Ref.h
+++ clang-tools-extra/clangd/index/Ref.h
@@ -88,13 +88,16 @@
/// The source location where the symbol is named.
SymbolLocation Location;
RefKind Kind = RefKind::Unknown;
+ SymbolID Container;
};
inline bool operator<(const Ref &L, const Ref &R) {
- return std::tie(L.Location, L.Kind) < std::tie(R.Location, R.Kind);
+ return std::tie(L.Location, L.Kind, L.Container) <
+ std::tie(R.Location, R.Kind, R.Container);
}
inline bool operator==(const Ref &L, const Ref &R) {
- return std::tie(L.Location, L.Kind) == std::tie(R.Location, R.Kind);
+ return std::tie(L.Location, L.Kind, L.Container) ==
+ std::tie(R.Location, R.Kind, R.Container);
}
llvm::raw_ostream &operator<<(llvm::raw_ostream &, const Ref &);
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
