hokein created this revision. hokein added a reviewer: kbobyrev. Herald added subscribers: usaxena95, kadircet, arphaman, jkorous, MaskRay, ilya-biryukov. Herald added a project: clang.
Repository: rG LLVM Github Monorepo https://reviews.llvm.org/D74395 Files: clang-tools-extra/clangd/refactor/Rename.cpp
Index: clang-tools-extra/clangd/refactor/Rename.cpp =================================================================== --- clang-tools-extra/clangd/refactor/Rename.cpp +++ clang-tools-extra/clangd/refactor/Rename.cpp @@ -13,6 +13,7 @@ #include "ParsedAST.h" #include "Selection.h" #include "SourceCode.h" +#include "Trace.h" #include "index/SymbolCollector.h" #include "clang/AST/DeclCXX.h" #include "clang/AST/DeclTemplate.h" @@ -124,6 +125,7 @@ StringRef MainFilePath, const SymbolIndex *Index, bool CrossFile) { + trace::Span Tracer("Renameable"); // Filter out symbols that are unsupported in both rename modes. if (llvm::isa<NamespaceDecl>(&RenameDecl)) return ReasonToReject::UnsupportedSymbol; @@ -225,6 +227,7 @@ // Return all rename occurrences in the main file. std::vector<SourceLocation> findOccurrencesWithinFile(ParsedAST &AST, const NamedDecl &ND) { + trace::Span Tracer("FindOccurrenceeWithinFile"); // If the cursor is at the underlying CXXRecordDecl of the // ClassTemplateDecl, ND will be the CXXRecordDecl. In this case, we need to // get the primary template maunally. @@ -260,6 +263,7 @@ llvm::Expected<tooling::Replacements> renameWithinFile(ParsedAST &AST, const NamedDecl &RenameDecl, llvm::StringRef NewName) { + trace::Span Tracer("RenameWithinFile"); const SourceManager &SM = AST.getSourceManager(); tooling::Replacements FilteredChanges; @@ -302,6 +306,7 @@ llvm::Expected<llvm::StringMap<std::vector<Range>>> findOccurrencesOutsideFile(const NamedDecl &RenameDecl, llvm::StringRef MainFile, const SymbolIndex &Index) { + trace::Span Tracer("FindOccurrencesOutsideFile"); RefsRequest RQuest; RQuest.IDs.insert(*getSymbolID(&RenameDecl)); @@ -336,6 +341,9 @@ auto &Ranges = FileAndOccurrences.getValue(); llvm::sort(Ranges); Ranges.erase(std::unique(Ranges.begin(), Ranges.end()), Ranges.end()); + + SPAN_ATTACH(Tracer, FileAndOccurrences.first(), + static_cast<int64_t>(Ranges.size())); } return AffectedFiles; } @@ -356,6 +364,7 @@ const NamedDecl &RenameDecl, llvm::StringRef MainFilePath, llvm::StringRef NewName, const SymbolIndex &Index, llvm::function_ref<llvm::Expected<std::string>(PathRef)> GetFileContent) { + trace::Span Tracer("RenameOutsideFile"); auto AffectedFiles = findOccurrencesOutsideFile(RenameDecl, MainFilePath, Index); if (!AffectedFiles) @@ -438,6 +447,7 @@ } // namespace llvm::Expected<FileEdits> rename(const RenameInputs &RInputs) { + trace::Span Tracer("Rename flow"); ParsedAST &AST = RInputs.AST; const SourceManager &SM = AST.getSourceManager(); llvm::StringRef MainFileCode = SM.getBufferData(SM.getMainFileID()); @@ -530,6 +540,11 @@ llvm::StringRef InitialCode, std::vector<Range> Occurrences, llvm::StringRef NewName) { + trace::Span Tracer("BuildRenameEdit"); + SPAN_ATTACH(Tracer, "file_path", AbsFilePath); + SPAN_ATTACH(Tracer, "rename_occurrences", + static_cast<int64_t>(Occurrences.size())); + assert(std::is_sorted(Occurrences.begin(), Occurrences.end())); assert(std::unique(Occurrences.begin(), Occurrences.end()) == Occurrences.end() && @@ -593,6 +608,7 @@ llvm::Optional<std::vector<Range>> adjustRenameRanges(llvm::StringRef DraftCode, llvm::StringRef Identifier, std::vector<Range> Indexed, const LangOptions &LangOpts) { + trace::Span Tracer("AdjustRenameRanges"); assert(!Indexed.empty()); assert(std::is_sorted(Indexed.begin(), Indexed.end())); std::vector<Range> Lexed = @@ -603,6 +619,7 @@ llvm::Optional<std::vector<Range>> getMappedRanges(ArrayRef<Range> Indexed, ArrayRef<Range> Lexed) { + trace::Span Tracer("GetMappedRanges"); assert(!Indexed.empty()); assert(std::is_sorted(Indexed.begin(), Indexed.end())); assert(std::is_sorted(Lexed.begin(), Lexed.end())); @@ -635,15 +652,18 @@ }); if (HasMultiple) { vlog("The best near miss is not unique."); + SPAN_ATTACH(Tracer, "error", "The best near miss is not unique"); return llvm::None; } if (Best.empty()) { vlog("Didn't find a near miss."); + SPAN_ATTACH(Tracer, "error", "Didn't find a near miss"); return llvm::None; } std::vector<Range> Mapped; for (auto I : Best) Mapped.push_back(Lexed[I]); + SPAN_ATTACH(Tracer, "mapped_ranges", static_cast<int64_t>(Mapped.size())); return Mapped; }
_______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits