Author: Haojian Wu Date: 2020-02-25T16:56:35+01:00 New Revision: e6d0bad843c4c84bb762cf93a56c5bdd5cc535c0
URL: https://github.com/llvm/llvm-project/commit/e6d0bad843c4c84bb762cf93a56c5bdd5cc535c0 DIFF: https://github.com/llvm/llvm-project/commit/e6d0bad843c4c84bb762cf93a56c5bdd5cc535c0.diff LOG: [clang-rename] Add the USR of incomplete decl to the USRSet. Summary: This fixes a clangd rename issue, which is missing the reference of an incomplete specialization. Unfortunately, I didn't reproduce this issue in clang-rename, I guess the input `FoundDecl` of AdditionalUSRFinder is different in clangd vs clang-rename, clang-rename uses the underlying CXXRecordDecl of the ClassTemplateDecl, which is fixed in https://github.com/llvm/llvm-project/commit/5d862c042b52ae2aad37471d0b83b6c678a520e3; while clangd-rename uses the ClassTemplateDecl. Reviewers: kbobyrev Reviewed By: kbobyrev Subscribers: ilya-biryukov, jkorous, arphaman, kadircet, usaxena95, cfe-commits Tags: #clang Differential Revision: https://reviews.llvm.org/D74829 Added: Modified: clang-tools-extra/clangd/unittests/RenameTests.cpp clang/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp Removed: ################################################################################ diff --git a/clang-tools-extra/clangd/unittests/RenameTests.cpp b/clang-tools-extra/clangd/unittests/RenameTests.cpp index aa08be484ea3..82930eb3e0ce 100644 --- a/clang-tools-extra/clangd/unittests/RenameTests.cpp +++ b/clang-tools-extra/clangd/unittests/RenameTests.cpp @@ -202,6 +202,13 @@ TEST(RenameTest, WithinFileRename) { } )cpp", + // Incomplete class specializations + R"cpp( + template <typename T> + class [[Fo^o]] {}; + void func([[Foo]]<int>); + )cpp", + // Template class instantiations. R"cpp( template <typename T> diff --git a/clang/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp b/clang/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp index a17b880a71a0..43dc32e158d3 100644 --- a/clang/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp +++ b/clang/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp @@ -126,12 +126,14 @@ class AdditionalUSRFinder : public RecursiveASTVisitor<AdditionalUSRFinder> { addUSRsOfCtorDtors(TemplateDecl->getTemplatedDecl()); } - void addUSRsOfCtorDtors(const CXXRecordDecl *RecordDecl) { - RecordDecl = RecordDecl->getDefinition(); + void addUSRsOfCtorDtors(const CXXRecordDecl *RD) { + const auto* RecordDecl = RD->getDefinition(); // Skip if the CXXRecordDecl doesn't have definition. - if (!RecordDecl) + if (!RecordDecl) { + USRSet.insert(getUSRForDecl(RD)); return; + } for (const auto *CtorDecl : RecordDecl->ctors()) USRSet.insert(getUSRForDecl(CtorDecl)); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
