This revision was automatically updated to reflect the committed changes.
Closed by commit rCTE358413: [clangd] Fallback to OrigD when SLoc is invalid
(authored by kadircet, committed by ).
Changed prior to commit:
https://reviews.llvm.org/D60689?vs=195140&id=195179#toc
Repository:
rCTE Clang Tools Extra
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D60689/new/
https://reviews.llvm.org/D60689
Files:
clangd/index/SymbolCollector.cpp
unittests/clangd/SymbolCollectorTests.cpp
Index: clangd/index/SymbolCollector.cpp
===================================================================
--- clangd/index/SymbolCollector.cpp
+++ 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 =
Index: unittests/clangd/SymbolCollectorTests.cpp
===================================================================
--- unittests/clangd/SymbolCollectorTests.cpp
+++ 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
Index: clangd/index/SymbolCollector.cpp
===================================================================
--- clangd/index/SymbolCollector.cpp
+++ 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 =
Index: unittests/clangd/SymbolCollectorTests.cpp
===================================================================
--- unittests/clangd/SymbolCollectorTests.cpp
+++ 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
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
