Commit f669262c authored by Hans Wennborg's avatar Hans Wennborg
Browse files

Merging r351738: 

------------------------------------------------------------------------
r351738 | kadircet | 2019-01-21 11:10:18 +0100 (Mon, 21 Jan 2019) | 9 lines

[clang-tidy] Use getStripPluginsAdjuster

Summary: See rC351531 for the introduction of getStripPluginsAdjuster.

Reviewers: alexfh

Subscribers: xazax.hun, cfe-commits

Differential Revision: https://reviews.llvm.org/D56902
------------------------------------------------------------------------

llvm-svn: 351962
parent d0fae09c

clang-tools-extra/clang-tidy/ClangTidy.cpp

+1 −17
Original line number Diff line number Diff line
@@ -529,24 +529,8 @@ runClangTidy(clang::tidy::ClangTidyContext &Context, 
        return AdjustedArgs;

      };



  // Remove plugins arguments.

  ArgumentsAdjuster PluginArgumentsRemover =

      [](const CommandLineArguments &Args, StringRef Filename) {

        CommandLineArguments AdjustedArgs;

        for (size_t I = 0, E = Args.size(); I < E; ++I) {

          if (I + 4 < Args.size() && Args[I] == "-Xclang" &&

              (Args[I + 1] == "-load" || Args[I + 1] == "-add-plugin" ||

               StringRef(Args[I + 1]).startswith("-plugin-arg-")) &&

              Args[I + 2] == "-Xclang") {

            I += 3;

          } else

            AdjustedArgs.push_back(Args[I]);

        }

        return AdjustedArgs;

      };



  Tool.appendArgumentsAdjuster(PerFileExtraArgumentsInserter);

  Tool.appendArgumentsAdjuster(PluginArgumentsRemover);

  Tool.appendArgumentsAdjuster(getStripPluginsAdjuster());

  Context.setEnableProfiling(EnableCheckProfile);

  Context.setProfileStoragePrefix(StoreCheckProfile);