Author: vmiklos Date: Mon Sep 11 13:18:38 2017 New Revision: 312942 URL: http://llvm.org/viewvc/llvm-project?rev=312942&view=rev Log: clang-rename: let -force handle multiple renames
Summary: The use case is that renaming multiple symbols in a large enough codebase is much faster if all of these can be done with a single invocation, but there will be multiple translation units where one or more symbols are not found. Old behavior was to exit with an error (default) or exit without reporting an error (-force). New behavior is that -force results in a best-effort rename: rename symbols which are found and just ignore the rest. The existing help for -force sort of already implies this behavior. Reviewers: cfe-commits, klimek, arphaman Reviewed By: klimek Differential Revision: https://reviews.llvm.org/D37634 Added: cfe/trunk/test/clang-rename/ForceMulti.cpp Modified: cfe/trunk/lib/Tooling/Refactoring/Rename/RenamingAction.cpp cfe/trunk/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp cfe/trunk/tools/clang-rename/ClangRename.cpp Modified: cfe/trunk/lib/Tooling/Refactoring/Rename/RenamingAction.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/Refactoring/Rename/RenamingAction.cpp?rev=312942&r1=312941&r2=312942&view=diff ============================================================================== --- cfe/trunk/lib/Tooling/Refactoring/Rename/RenamingAction.cpp (original) +++ cfe/trunk/lib/Tooling/Refactoring/Rename/RenamingAction.cpp Mon Sep 11 13:18:38 2017 @@ -84,8 +84,13 @@ public: FileToReplaces(FileToReplaces), PrintLocations(PrintLocations) {} void HandleTranslationUnit(ASTContext &Context) override { - for (unsigned I = 0; I < NewNames.size(); ++I) + for (unsigned I = 0; I < NewNames.size(); ++I) { + // If the previous name was not found, ignore this rename request. + if (PrevNames[I].empty()) + continue; + HandleOneRename(Context, NewNames[I], PrevNames[I], USRList[I]); + } } void HandleOneRename(ASTContext &Context, const std::string &NewName, Modified: cfe/trunk/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp?rev=312942&r1=312941&r2=312942&view=diff ============================================================================== --- cfe/trunk/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp (original) +++ cfe/trunk/lib/Tooling/Refactoring/Rename/USRFindingAction.cpp Mon Sep 11 13:18:38 2017 @@ -198,8 +198,11 @@ private: return false; } - if (Force) + if (Force) { + SpellingNames.push_back(std::string()); + USRList.push_back(std::vector<std::string>()); return true; + } unsigned CouldNotFindSymbolNamed = Engine.getCustomDiagID( DiagnosticsEngine::Error, "clang-rename could not find symbol %0"); Added: cfe/trunk/test/clang-rename/ForceMulti.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/clang-rename/ForceMulti.cpp?rev=312942&view=auto ============================================================================== --- cfe/trunk/test/clang-rename/ForceMulti.cpp (added) +++ cfe/trunk/test/clang-rename/ForceMulti.cpp Mon Sep 11 13:18:38 2017 @@ -0,0 +1,8 @@ +class B /* Test 1 */ { // CHECK: class B2 /* Test 1 */ { +}; + +class D : public B /* Test 1 */ { // CHECK: class D : public B2 /* Test 1 */ { +}; + +// Test 1. +// RUN: clang-rename -force -qualified-name B -new-name B2 -qualified-name E -new-name E2 %s -- | sed 's,//.*,,' | FileCheck %s Modified: cfe/trunk/tools/clang-rename/ClangRename.cpp URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/tools/clang-rename/ClangRename.cpp?rev=312942&r1=312941&r2=312942&view=diff ============================================================================== --- cfe/trunk/tools/clang-rename/ClangRename.cpp (original) +++ cfe/trunk/tools/clang-rename/ClangRename.cpp Mon Sep 11 13:18:38 2017 @@ -175,12 +175,6 @@ int main(int argc, const char **argv) { return 1; } - if (Force && PrevNames.size() < NewNames.size()) { - // No matching PrevName for all NewNames. Without Force this is an error - // above already. - return 0; - } - // Perform the renaming. tooling::RenamingAction RenameAction(NewNames, PrevNames, USRList, Tool.getReplacements(), PrintLocations); _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits