Author: Sam McCall Date: 2022-09-19T16:59:28+02:00 New Revision: e4244183582721b1ff47be669f1a115625c46a2f
URL: https://github.com/llvm/llvm-project/commit/e4244183582721b1ff47be669f1a115625c46a2f DIFF: https://github.com/llvm/llvm-project/commit/e4244183582721b1ff47be669f1a115625c46a2f.diff LOG: [clangd] Allow programmatically disabling rename of virtual method hierarchies. This feature relies on Relations in the index being complete. An out-of-tree index implementation is missing some override relations, so such renames end up breaking the code. We plan to fix it, but this flag is a cheap band-aid for now. Differential Revision: https://reviews.llvm.org/D133440 Added: Modified: clang-tools-extra/clangd/refactor/Rename.cpp clang-tools-extra/clangd/refactor/Rename.h Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/refactor/Rename.cpp b/clang-tools-extra/clangd/refactor/Rename.cpp index 6358a05667bd..4e367898c6bf 100644 --- a/clang-tools-extra/clangd/refactor/Rename.cpp +++ b/clang-tools-extra/clangd/refactor/Rename.cpp @@ -181,8 +181,15 @@ enum class ReasonToReject { llvm::Optional<ReasonToReject> renameable(const NamedDecl &RenameDecl, StringRef MainFilePath, - const SymbolIndex *Index) { + const SymbolIndex *Index, + const RenameOptions& Opts) { trace::Span Tracer("Renameable"); + if (!Opts.RenameVirtual) { + if (const auto *S = llvm::dyn_cast<CXXMethodDecl>(&RenameDecl)) { + if (S->isVirtual()) + return ReasonToReject::UnsupportedSymbol; + } + } // Filter out symbols that are unsupported in both rename modes. if (llvm::isa<NamespaceDecl>(&RenameDecl)) return ReasonToReject::UnsupportedSymbol; @@ -746,7 +753,8 @@ llvm::Expected<RenameResult> rename(const RenameInputs &RInputs) { if (Invalid) return makeError(std::move(*Invalid)); - auto Reject = renameable(RenameDecl, RInputs.MainFilePath, RInputs.Index); + auto Reject = + renameable(RenameDecl, RInputs.MainFilePath, RInputs.Index, Opts); if (Reject) return makeError(*Reject); diff --git a/clang-tools-extra/clangd/refactor/Rename.h b/clang-tools-extra/clangd/refactor/Rename.h index b4cdd1147fb6..036594e8bebd 100644 --- a/clang-tools-extra/clangd/refactor/Rename.h +++ b/clang-tools-extra/clangd/refactor/Rename.h @@ -26,6 +26,10 @@ struct RenameOptions { size_t LimitFiles = 50; /// If true, format the rename edits, only meaningful in ClangdServer layer. bool WantFormat = false; + /// Allow rename of virtual method hierarchies. + /// Disable to support broken index implementations with missing relations. + /// FIXME: fix those implementations and remove this option. + bool RenameVirtual = true; }; struct RenameInputs { _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
