Author: hans Date: Wed Jan 23 08:21:21 2019 New Revision: 351962 URL: http://llvm.org/viewvc/llvm-project?rev=351962&view=rev Log: 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 ------------------------------------------------------------------------ Modified: clang-tools-extra/branches/release_80/ (props changed) clang-tools-extra/branches/release_80/clang-tidy/ClangTidy.cpp Propchange: clang-tools-extra/branches/release_80/ ------------------------------------------------------------------------------ --- svn:mergeinfo (original) +++ svn:mergeinfo Wed Jan 23 08:21:21 2019 @@ -1 +1 @@ -/clang-tools-extra/trunk:351463,351466-351468,351686,351788 +/clang-tools-extra/trunk:351463,351466-351468,351531,351686,351738,351788 Modified: clang-tools-extra/branches/release_80/clang-tidy/ClangTidy.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/branches/release_80/clang-tidy/ClangTidy.cpp?rev=351962&r1=351961&r2=351962&view=diff ============================================================================== --- clang-tools-extra/branches/release_80/clang-tidy/ClangTidy.cpp (original) +++ clang-tools-extra/branches/release_80/clang-tidy/ClangTidy.cpp Wed Jan 23 08:21:21 2019 @@ -529,24 +529,8 @@ runClangTidy(clang::tidy::ClangTidyConte 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); _______________________________________________ llvm-branch-commits mailing list llvm-branch-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-branch-commits
