From e96f9cca3b1b346cf9764c4a3b7417a46ef59f12 Mon Sep 17 00:00:00 2001 From: Nathan James Date: Tue, 23 Feb 2021 13:48:06 +0000 Subject: [PATCH] [clang-tidy] Remove IncludeInserter from MoveConstructorInit check. This check registers an IncludeInserter, however the check itself doesn't actually emit any fixes or includes, so the inserter is redundant. From what I can tell the fixes were removed in D26453(rL290051) but the inserter was left in, probably an oversight. Reviewed By: aaron.ballman Differential Revision: https://reviews.llvm.org/D97243 --- .../performance/MoveConstructorInitCheck.cpp | 18 ++---------------- .../clang-tidy/performance/MoveConstructorInitCheck.h | 9 --------- clang-tools-extra/docs/clang-tidy/checks/list.rst | 4 ++-- .../checks/performance-move-constructor-init.rst | 8 -------- 4 files changed, 4 insertions(+), 35 deletions(-) diff --git a/clang-tools-extra/clang-tidy/performance/MoveConstructorInitCheck.cpp b/clang-tools-extra/clang-tidy/performance/MoveConstructorInitCheck.cpp index 35afa31..34d8e72 100644 --- a/clang-tools-extra/clang-tidy/performance/MoveConstructorInitCheck.cpp +++ b/clang-tools-extra/clang-tidy/performance/MoveConstructorInitCheck.cpp @@ -10,9 +10,6 @@ #include "../utils/Matchers.h" #include "clang/AST/ASTContext.h" #include "clang/ASTMatchers/ASTMatchFinder.h" -#include "clang/Frontend/CompilerInstance.h" -#include "clang/Lex/Lexer.h" -#include "clang/Lex/Preprocessor.h" using namespace clang::ast_matchers; @@ -22,9 +19,7 @@ namespace performance { MoveConstructorInitCheck::MoveConstructorInitCheck(StringRef Name, ClangTidyContext *Context) - : ClangTidyCheck(Name, Context), - Inserter(Options.getLocalOrGlobal("IncludeStyle", - utils::IncludeSorter::IS_LLVM)) {} + : ClangTidyCheck(Name, Context) {} void MoveConstructorInitCheck::registerMatchers(MatchFinder *Finder) { Finder->addMatcher( @@ -68,7 +63,7 @@ void MoveConstructorInitCheck::check(const MatchFinder::MatchResult &Result) { // initializer. // // FIXME: Determine whether the move constructor is a viable candidate - // for the ctor-initializer, perhaps provide a fixit that suggests + // for the ctor-initializer, perhaps provide a fix-it that suggests // using std::move(). Candidate = Ctor; break; @@ -88,15 +83,6 @@ void MoveConstructorInitCheck::check(const MatchFinder::MatchResult &Result) { } } -void MoveConstructorInitCheck::registerPPCallbacks( - const SourceManager &SM, Preprocessor *PP, Preprocessor *ModuleExpanderPP) { - Inserter.registerPreprocessor(PP); -} - -void MoveConstructorInitCheck::storeOptions(ClangTidyOptions::OptionMap &Opts) { - Options.store(Opts, "IncludeStyle", Inserter.getStyle()); -} - } // namespace performance } // namespace tidy } // namespace clang diff --git a/clang-tools-extra/clang-tidy/performance/MoveConstructorInitCheck.h b/clang-tools-extra/clang-tidy/performance/MoveConstructorInitCheck.h index 0b637b6..fae4c08 100644 --- a/clang-tools-extra/clang-tidy/performance/MoveConstructorInitCheck.h +++ b/clang-tools-extra/clang-tidy/performance/MoveConstructorInitCheck.h @@ -10,9 +10,6 @@ #define LLVM_CLANG_TOOLS_EXTRA_CLANG_TIDY_PERFORMANCE_MOVECONSTRUCTORINITCHECK_H #include "../ClangTidyCheck.h" -#include "../utils/IncludeInserter.h" - -#include namespace clang { namespace tidy { @@ -31,12 +28,6 @@ public: } void registerMatchers(ast_matchers::MatchFinder *Finder) override; void check(const ast_matchers::MatchFinder::MatchResult &Result) override; - void registerPPCallbacks(const SourceManager &SM, Preprocessor *PP, - Preprocessor *ModuleExpanderPP) override; - void storeOptions(ClangTidyOptions::OptionMap &Opts) override; - -private: - utils::IncludeInserter Inserter; }; } // namespace performance diff --git a/clang-tools-extra/docs/clang-tidy/checks/list.rst b/clang-tools-extra/docs/clang-tidy/checks/list.rst index 23365e4..e53c0e7 100644 --- a/clang-tools-extra/docs/clang-tidy/checks/list.rst +++ b/clang-tools-extra/docs/clang-tidy/checks/list.rst @@ -264,7 +264,7 @@ Clang-Tidy Checks `performance-inefficient-string-concatenation `_, `performance-inefficient-vector-operation `_, "Yes" `performance-move-const-arg `_, "Yes" - `performance-move-constructor-init `_, "Yes" + `performance-move-constructor-init `_, `performance-no-automatic-move `_, `performance-no-int-to-ptr `_, `performance-noexcept-move-constructor `_, "Yes" @@ -331,7 +331,7 @@ Clang-Tidy Checks `cert-fio38-c `_, `misc-non-copyable-objects `_, `cert-msc30-c `_, `cert-msc50-cpp `_, `cert-msc32-c `_, `cert-msc51-cpp `_, - `cert-oop11-cpp `_, `performance-move-constructor-init `_, "Yes" + `cert-oop11-cpp `_, `performance-move-constructor-init `_, `cert-oop54-cpp `_, `bugprone-unhandled-self-assignment `_, `cert-pos44-c `_, `bugprone-bad-signal-to-kill-thread `_, `cert-pos47-c `_, `concurrency-thread-canceltype-asynchronous `_, diff --git a/clang-tools-extra/docs/clang-tidy/checks/performance-move-constructor-init.rst b/clang-tools-extra/docs/clang-tidy/checks/performance-move-constructor-init.rst index a193b9e..9dc0761 100644 --- a/clang-tools-extra/docs/clang-tidy/checks/performance-move-constructor-init.rst +++ b/clang-tools-extra/docs/clang-tidy/checks/performance-move-constructor-init.rst @@ -8,11 +8,3 @@ performance-move-constructor-init The check flags user-defined move constructors that have a ctor-initializer initializing a member or base class through a copy constructor instead of a move constructor. - -Options -------- - -.. option:: IncludeStyle - - A string specifying which include-style is used, `llvm` or `google`. Default - is `llvm`. -- 2.7.4