kadircet created this revision.
kadircet added a reviewer: sammccall.
Herald added subscribers: cfe-commits, usaxena95, arphaman, jkorous, MaskRay,
ilya-biryukov.
Herald added a project: clang.
Get rid of calls to lexer and unnecessary source location
transformations.
Repository:
rG LLVM Github Monorepo
https://reviews.llvm.org/D75166
Files:
clang-tools-extra/clangd/XRefs.cpp
Index: clang-tools-extra/clangd/XRefs.cpp
===================================================================
--- clang-tools-extra/clangd/XRefs.cpp
+++ clang-tools-extra/clangd/XRefs.cpp
@@ -214,24 +214,35 @@
}
}
+ auto CurLoc = sourceLocationInMainFile(SM, Pos);
+ if (!CurLoc) {
+ elog("locateSymbolAt failed to convert position to source location: {0}",
+ CurLoc.takeError());
+ return {};
+ }
+
+ const auto &TB = AST.getTokens();
// Macros are simple: there's no declaration/definition distinction.
// As a consequence, there's no need to look them up in the index either.
- SourceLocation IdentStartLoc = SM.getMacroArgExpandedLocation(
- getBeginningOfIdentifier(Pos, AST.getSourceManager(), AST.getLangOpts()));
std::vector<LocatedSymbol> Result;
- if (auto M = locateMacroAt(IdentStartLoc, AST.getPreprocessor())) {
- if (auto Loc = makeLocation(AST.getASTContext(),
- M->Info->getDefinitionLoc(), *MainFilePath)) {
- LocatedSymbol Macro;
- Macro.Name = std::string(M->Name);
- Macro.PreferredDeclaration = *Loc;
- Macro.Definition = Loc;
- Result.push_back(std::move(Macro));
-
- // Don't look at the AST or index if we have a macro result.
- // (We'd just return declarations referenced from the macro's
- // expansion.)
- return Result;
+ const auto *IdentifierCoveringCursor =
+ syntax::spelledIdentifierTouching(*CurLoc, TB);
+ if (IdentifierCoveringCursor) {
+ if (auto M = locateMacroAt(IdentifierCoveringCursor->location(),
+ AST.getPreprocessor())) {
+ if (auto Loc = makeLocation(AST.getASTContext(),
+ M->Info->getDefinitionLoc(), *MainFilePath)) {
+ LocatedSymbol Macro;
+ Macro.Name = std::string(M->Name);
+ Macro.PreferredDeclaration = *Loc;
+ Macro.Definition = Loc;
+ Result.push_back(std::move(Macro));
+
+ // Don't look at the AST or index if we have a macro result.
+ // (We'd just return declarations referenced from the macro's
+ // expansion.)
+ return Result;
+ }
}
}
@@ -244,15 +255,6 @@
// Keep track of SymbolID -> index mapping, to fill in index data later.
llvm::DenseMap<SymbolID, size_t> ResultIndex;
- SourceLocation SourceLoc;
- if (auto L = sourceLocationInMainFile(SM, Pos)) {
- SourceLoc = *L;
- } else {
- elog("locateSymbolAt failed to convert position to source location: {0}",
- L.takeError());
- return Result;
- }
-
auto AddResultDecl = [&](const NamedDecl *D) {
const NamedDecl *Def = getDefinition(D);
const NamedDecl *Preferred = Def ? Def : D;
@@ -277,16 +279,15 @@
// Emit all symbol locations (declaration or definition) from AST.
DeclRelationSet Relations =
DeclRelation::TemplatePattern | DeclRelation::Alias;
- for (const NamedDecl *D : getDeclAtPosition(AST, SourceLoc, Relations)) {
+ for (const NamedDecl *D : getDeclAtPosition(AST, *CurLoc, Relations)) {
// Special case: void foo() ^override: jump to the overridden method.
if (const auto *CMD = llvm::dyn_cast<CXXMethodDecl>(D)) {
- const InheritableAttr* Attr = D->getAttr<OverrideAttr>();
+ const InheritableAttr *Attr = D->getAttr<OverrideAttr>();
if (!Attr)
Attr = D->getAttr<FinalAttr>();
- const syntax::Token *Tok =
- spelledIdentifierTouching(SourceLoc, AST.getTokens());
- if (Attr && Tok &&
- SM.getSpellingLoc(Attr->getLocation()) == Tok->location()) {
+ if (Attr && IdentifierCoveringCursor &&
+ SM.getSpellingLoc(Attr->getLocation()) ==
+ IdentifierCoveringCursor->location()) {
// We may be overridding multiple methods - offer them all.
for (const NamedDecl *ND : CMD->overridden_methods())
AddResultDecl(ND);
@@ -296,8 +297,9 @@
// Special case: the point of declaration of a template specialization,
// it's more useful to navigate to the template declaration.
- if (SM.getMacroArgExpandedLocation(D->getLocation()) == IdentStartLoc) {
- if (auto *CTSD = dyn_cast<ClassTemplateSpecializationDecl>(D)) {
+ if (auto *CTSD = dyn_cast<ClassTemplateSpecializationDecl>(D)) {
+ if (IdentifierCoveringCursor &&
+ D->getLocation() == IdentifierCoveringCursor->location()) {
AddResultDecl(CTSD->getSpecializedTemplate());
continue;
}
@@ -757,7 +759,6 @@
return Result != nullptr;
});
return Result;
-
}
std::vector<const CXXRecordDecl *> typeParents(const CXXRecordDecl *CXXRD) {
_______________________________________________
cfe-commits mailing list
cfe-commits@lists.llvm.org
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
