[clang-tools-extra] r328997 - Revert r328932 as it caused Windows and MacOS bot failures.

[Mike Edwards via cfe-commits]

Author: sqlbyme
Date: Mon Apr  2 11:02:36 2018
New Revision: 328997

URL: http://llvm.org/viewvc/llvm-project?rev=328997&view=rev
Log:
Revert r328932 as it caused Windows and MacOS bot failures.

http://green.lab.llvm.org/green/job/clang-stage1-configure-RA/43991/

Removed:
    clang-tools-extra/trunk/test/clang-tidy/clang-tidy-__clang_analyzer__macro.cpp
Modified:
    clang-tools-extra/trunk/clang-tidy/ClangTidy.cpp

Modified: clang-tools-extra/trunk/clang-tidy/ClangTidy.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clang-tidy/ClangTidy.cpp?rev=328997&r1=328996&r2=328997&view=diff
==============================================================================
--- clang-tools-extra/trunk/clang-tidy/ClangTidy.cpp (original)
+++ clang-tools-extra/trunk/clang-tidy/ClangTidy.cpp Mon Apr  2 11:02:36 2018
@@ -481,16 +481,6 @@ void runClangTidy(clang::tidy::ClangTidy
   ClangTool Tool(Compilations, InputFiles,
                  std::make_shared<PCHContainerOperations>(), BaseFS);
 
-  // Add __clang_analyzer__ macro definition for compatibility with the clang
-  // static analyzer.
-  ArgumentsAdjuster ClangTidyMacroDefinitionInserter =
-      [&Context](const CommandLineArguments &Args, StringRef Filename) {
-        ClangTidyOptions Opts = Context.getOptionsForFile(Filename);
-        CommandLineArguments AdjustedArgs = Args;
-        AdjustedArgs.emplace_back("-D__clang_analyzer__");
-        return AdjustedArgs;
-      };
-
   // Add extra arguments passed by the clang-tidy command-line.
   ArgumentsAdjuster PerFileExtraArgumentsInserter =
       [&Context](const CommandLineArguments &Args, StringRef Filename) {
@@ -525,7 +515,6 @@ void runClangTidy(clang::tidy::ClangTidy
         return AdjustedArgs;
       };
 
-  Tool.appendArgumentsAdjuster(ClangTidyMacroDefinitionInserter);
   Tool.appendArgumentsAdjuster(PerFileExtraArgumentsInserter);
   Tool.appendArgumentsAdjuster(PluginArgumentsRemover);
   if (Profile)

Removed: clang-tools-extra/trunk/test/clang-tidy/clang-tidy-__clang_analyzer__macro.cpp
URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clang-tidy/clang-tidy-__clang_analyzer__macro.cpp?rev=328996&view=auto
==============================================================================
--- clang-tools-extra/trunk/test/clang-tidy/clang-tidy-__clang_analyzer__macro.cpp (original)
+++ clang-tools-extra/trunk/test/clang-tidy/clang-tidy-__clang_analyzer__macro.cpp (removed)
@@ -1,8 +0,0 @@
-// RUN: %check_clang_tidy %s * %t
-
-#if defined(__clang_analyzer__)
-#warning __clang_analyzer__ is defined
-#endif
-// CHECK-MESSAGES: :[[@LINE-2]]:2: warning: __clang_analyzer__ is defined [clang-diagnostic-#warnings]
-
-