usaxena95 updated this revision to Diff 228679.
usaxena95 marked an inline comment as done.
usaxena95 added a comment.
Rebase
Repository:
rG LLVM Github Monorepo
CHANGES SINCE LAST ACTION
https://reviews.llvm.org/D70008/new/
https://reviews.llvm.org/D70008
Files:
clang-tools-extra/clangd/CollectMacros.h
clang-tools-extra/clangd/XRefs.cpp
clang-tools-extra/clangd/unittests/XRefsTests.cpp
Index: clang-tools-extra/clangd/unittests/XRefsTests.cpp
===================================================================
--- clang-tools-extra/clangd/unittests/XRefsTests.cpp
+++ clang-tools-extra/clangd/unittests/XRefsTests.cpp
@@ -2050,6 +2050,23 @@
} // namespace ns
int main() { [[^ns]]::Foo foo; }
)cpp",
+
+ R"cpp(// Macros
+ #define [[FOO]](x,y) (x + y)
+ // FIXME: No references for nested macros.
+ #define BAR(x,y,z) (FOO(x, y) * FOO(y, z))
+ int main() {
+ int x = [[FOO]](1, 2);
+ int y = [[FOO]]([[FO^O]](x, 1), [[FOO]](1, 1));
+ int z = BAR(1, 2, 3);
+ }
+ #define FOO(x) (x + 1)
+ )cpp",
+
+ R"cpp(// Macros: Cursor on definition.
+ #define [[F^OO]](x,y) (x + y)
+ int main() { int x = [[FOO]](1, 2); }
+ )cpp",
};
for (const char *Test : Tests) {
Annotations T(Test);
Index: clang-tools-extra/clangd/XRefs.cpp
===================================================================
--- clang-tools-extra/clangd/XRefs.cpp
+++ clang-tools-extra/clangd/XRefs.cpp
@@ -21,6 +21,7 @@
#include "index/Merge.h"
#include "index/Relation.h"
#include "index/SymbolCollector.h"
+#include "index/SymbolID.h"
#include "index/SymbolLocation.h"
#include "clang/AST/ASTContext.h"
#include "clang/AST/Decl.h"
@@ -47,6 +48,7 @@
#include "llvm/Support/FormatVariadic.h"
#include "llvm/Support/Path.h"
#include "llvm/Support/raw_ostream.h"
+#include <set>
namespace clang {
namespace clangd {
@@ -891,7 +893,20 @@
}
auto Loc = SM.getMacroArgExpandedLocation(
getBeginningOfIdentifier(Pos, SM, AST.getASTContext().getLangOpts()));
- // TODO: should we handle macros, too?
+
+ // Handle macros.
+ if (auto Macro = locateMacroAt(Loc, AST.getPreprocessor())) {
+ if (auto MacroSID = getSymbolID(Macro->Name, Macro->Info, SM)) {
+ const auto &IDToRefs = AST.getMacros().MacroRefs;
+ auto Refs = IDToRefs.find(*MacroSID);
+ if (Refs != IDToRefs.end())
+ Results.insert(Results.end(), Refs->second.begin(), Refs->second.end());
+ }
+ if (Results.size() > Limit)
+ Results.resize(Limit);
+ return Results;
+ }
+
// We also show references to the targets of using-decls, so we include
// DeclRelation::Underlying.
DeclRelationSet Relations = DeclRelation::TemplatePattern |
@@ -911,8 +926,7 @@
MainFileRefs.end());
for (const auto &Ref : MainFileRefs) {
if (auto Range =
- getTokenRange(AST.getASTContext().getSourceManager(),
- AST.getASTContext().getLangOpts(), Ref.Loc)) {
+ getTokenRange(SM, AST.getASTContext().getLangOpts(), Ref.Loc)) {
Location Result;
Result.range = *Range;
Result.uri = URIForFile::canonicalize(*MainFilePath, *MainFilePath);
Index: clang-tools-extra/clangd/CollectMacros.h
===================================================================
--- clang-tools-extra/clangd/CollectMacros.h
+++ clang-tools-extra/clangd/CollectMacros.h
@@ -9,10 +9,13 @@
#ifndef LLVM_CLANG_TOOLS_EXTRA_CLANGD_COLLECTEDMACROS_H
#define LLVM_CLANG_TOOLS_EXTRA_CLANGD_COLLECTEDMACROS_H
+#include "AST.h"
#include "Protocol.h"
#include "SourceCode.h"
+#include "index/SymbolID.h"
#include "clang/Basic/IdentifierTable.h"
#include "clang/Lex/PPCallbacks.h"
+#include "llvm/ADT/DenseMap.h"
#include <string>
namespace clang {
@@ -23,6 +26,7 @@
// Instead of storing SourceLocation, we have to store the token range because
// SourceManager from preamble is not available when we build the AST.
std::vector<Range> Ranges;
+ llvm::DenseMap<SymbolID, std::set<Location>> MacroRefs;
};
/// Collects macro references (e.g. definitions, expansions) in the main file.
@@ -39,6 +43,12 @@
void FileChanged(SourceLocation Loc, FileChangeReason,
SrcMgr::CharacteristicKind, FileID) override {
InMainFile = isInsideMainFile(Loc, SM);
+ if (InMainFile) {
+ auto MainFilePath =
+ getCanonicalPath(SM.getFileEntryForID(SM.getMainFileID()), SM);
+ if (MainFilePath)
+ MainFileURI = URIForFile::canonicalize(*MainFilePath, *MainFilePath);
+ }
}
void MacroDefined(const Token &MacroName, const MacroDirective *MD) override {
@@ -82,9 +92,17 @@
if (auto Range = getTokenRange(SM, LangOpts, Loc)) {
Out.Names.insert(MacroNameTok.getIdentifierInfo()->getName());
Out.Ranges.push_back(*Range);
+ if (auto SID = getSymbolID(MacroNameTok.getIdentifierInfo()->getName(),
+ MI, SM)) {
+ Location Loc;
+ Loc.uri = MainFileURI;
+ Loc.range = *Range;
+ Out.MacroRefs[*SID].insert(Loc);
+ }
}
}
const SourceManager &SM;
+ URIForFile MainFileURI;
const LangOptions &LangOpts;
bool InMainFile = true;
MainFileMacros &Out;
_______________________________________________
cfe-commits mailing list
[email protected]
https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
