[clangd] Fallback to OrigD when SLoc is invalid
Summary:
Some implicit/built-in decls lack the source location
information. Fallback to OrigD that we've seen in the source code
instead of the canonical one in those cases.
Reviewers: sammccall
Subscribers: cfe-commits, arphaman, jkorous, MaskRay, ioeric, ilya-biryukov
Tags: #clang
Differential Revision: https://reviews.llvm.org/D60689
git-svn-id: https://llvm.org/svn/llvm-project/clang-tools-extra/trunk@358413 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/clangd/index/SymbolCollector.cpp b/clangd/index/SymbolCollector.cpp
index a37ccd2..142e0f4 100644
--- a/clangd/index/SymbolCollector.cpp
+++ b/clangd/index/SymbolCollector.cpp
@@ -285,6 +285,11 @@
assert(ASTCtx && PP.get() && "ASTContext and Preprocessor must be set.");
assert(CompletionAllocator && CompletionTUInfo);
assert(ASTNode.OrigD);
+ // Indexing API puts cannonical decl into D, which might not have a valid
+ // source location for implicit/built-in decls. Fallback to original decl in
+ // such cases.
+ if (D->getLocation().isInvalid())
+ D = ASTNode.OrigD;
// If OrigD is an declaration associated with a friend declaration and it's
// not a definition, skip it. Note that OrigD is the occurrence that the
// collector is currently visiting.
@@ -540,6 +545,7 @@
S.SymInfo = index::getSymbolInfo(&ND);
std::string FileURI;
auto Loc = findNameLoc(&ND);
+ assert(Loc.isValid() && "Invalid source location for NamedDecl");
// FIXME: use the result to filter out symbols.
shouldIndexFile(SM, SM.getFileID(Loc), Opts, &FilesToIndexCache);
if (auto DeclLoc =
diff --git a/unittests/clangd/SymbolCollectorTests.cpp b/unittests/clangd/SymbolCollectorTests.cpp
index 5b9e553..bd46cc1 100644
--- a/unittests/clangd/SymbolCollectorTests.cpp
+++ b/unittests/clangd/SymbolCollectorTests.cpp
@@ -1241,6 +1241,14 @@
EXPECT_THAT(Symbols, Contains(QName("printf")));
}
+TEST_F(SymbolCollectorTest, InvalidSourceLoc) {
+ const char *Header = R"(
+ void operator delete(void*)
+ __attribute__((__externally_visible__));)";
+ runSymbolCollector(Header, /**/ "");
+ EXPECT_THAT(Symbols, Contains(QName("operator delete")));
+}
+
} // namespace
} // namespace clangd
} // namespace clang
