[static analyzer] Define __clang_analyzer__ macro in driver

[NoQ]

clang/test/Analysis/misc-ps.m

5–7 ↗

(On Diff #221428)

We can make a new test that tests the driver instead, i.e. something like

// RUN: %clang --analyze %s
#ifndef __clang_analyzer__
#error __clang_analyzer__ not defined
#endif

[jkorous]

Added the test.

[NoQ]

Thanks! I like how it makes the option transparent to fellow developers by having it show up in the -### run-line.

[dexonsmith]

clang/test/Analysis/misc-ps.m

5–7 ↗

(On Diff #221428)

Would it be better to add -D__clang_analyzer__ to the %clang_analyze_cc1 expansion?

[jkorous]

clang/test/Analysis/misc-ps.m

5–7 ↗

(On Diff #221428)

Good idea.

5–7 ↗

(On Diff #221428)

Good question! It seems to me I probably should (to keep implicit assumptions in tests intact).

[NoQ]

clang/test/Analysis/misc-ps.m

5–7 ↗

(On Diff #221428)

I don't really care, we don't ever need it in tests and we don't need more than one test to test the macro itself.

P.S. Whoops, i think we broke clang-tidy. I'm glad they had a test for this! :) I don't know how exactly were they picking up the macro.

cfe/trunk/lib/Driver/ToolChains/Clang.cpp

#endif
   // Some flags which affect the language (via preprocessor
   // defines).
   if (Args.hasArg(options::OPT_static))
     CmdArgs.push_back("-static-define");
 
   if (Args.hasArg(options::OPT_municode))
     CmdArgs.push_back("-DUNICODE");
 
-  if (isa<AnalyzeJobAction>(JA))
+  if (isa<AnalyzeJobAction>(JA)) {
     RenderAnalyzerOptions(Args, CmdArgs, Triple, Input);
+    CmdArgs.push_back("-D__clang_analyzer__");
+  }
 
   // Enable compatilibily mode to avoid analyzer-config related errors.
   // Since we can't access frontend flags through hasArg, let's manually iterate
   // through them.
   bool FoundAnalyzerConfig = false;
   for (auto Arg : Args.filtered(options::OPT_Xclang))
     if (StringRef(Arg->getValue()) == "-analyzer-config") {
       FoundAnalyzerConfig = true;

cfe/trunk/lib/Frontend/InitPreprocessor.cpp

#undef DEFINE_LOCK_FREE_MACRO
 
   if (LangOpts.getStackProtector() == LangOptions::SSPOn)
     Builder.defineMacro("__SSP__");
   else if (LangOpts.getStackProtector() == LangOptions::SSPStrong)
     Builder.defineMacro("__SSP_STRONG__", "2");
   else if (LangOpts.getStackProtector() == LangOptions::SSPReq)
     Builder.defineMacro("__SSP_ALL__", "3");
 
-  // Define a macro that exists only when using the static analyzer.
-  if (FEOpts.ProgramAction == frontend::RunAnalysis)
-    Builder.defineMacro("__clang_analyzer__");
-
   if (LangOpts.FastRelaxedMath)
     Builder.defineMacro("__FAST_RELAXED_MATH__");
 
   if (FEOpts.ProgramAction == frontend::RewriteObjC ||
       LangOpts.getGC() != LangOptions::NonGC) {
     Builder.defineMacro("__weak", "__attribute__((objc_gc(weak)))");
     Builder.defineMacro("__strong", "__attribute__((objc_gc(strong)))");
     Builder.defineMacro("__autoreleasing", "");

cfe/trunk/test/Analysis/misc-driver.c

+// RUN: %clang --analyze %s
+
+#ifndef __clang_analyzer__
+#error __clang_analyzer__ not defined
+#endif

cfe/trunk/test/Analysis/misc-ps.m

 // NOTE: Use '-fobjc-gc' to test the analysis being run twice, and multiple reports are not issued.
 // RUN: %clang_analyze_cc1 -triple i386-apple-darwin10 -analyzer-checker=core,alpha.core,osx.cocoa.AtSync -analyzer-store=region -verify -fblocks -Wno-unreachable-code -Wno-null-dereference -Wno-objc-root-class %s
 // RUN: %clang_analyze_cc1 -triple x86_64-apple-darwin10 -analyzer-checker=core,alpha.core,osx.cocoa.AtSync -analyzer-store=region -verify -fblocks -Wno-unreachable-code -Wno-null-dereference -Wno-objc-root-class %s
 
-#ifndef __clang_analyzer__
-#error __clang_analyzer__ not defined
-#endif
-
 typedef struct objc_ivar *Ivar;
 typedef struct objc_selector *SEL;
 typedef signed char BOOL;
 typedef int NSInteger;
 typedef unsigned int NSUInteger;
 typedef struct _NSZone NSZone;
 @class NSInvocation, NSArray, NSMethodSignature, NSCoder, NSString, NSEnumerator;
 @protocol NSObject