<html><head><meta http-equiv="Content-Type" content="text/html; charset=us-ascii"></head><body style="word-wrap: break-word; -webkit-nbsp-mode: space; line-break: after-white-space;" class="">Well, those were not fixups in the sense that I was aware of anything broken...<div class=""><br class=""></div><div class="">Anyway, I don't see a quick fix for clang-tidy so I'm going to revert.<br class=""><div><br class=""><blockquote type="cite" class=""><div class="">On Sep 23, 2019, at 8:00 PM, Nico Weber <<a href="mailto:thakis@chromium.org" class="">thakis@chromium.org</a>> wrote:</div><br class="Apple-interchange-newline"><div class=""><div dir="ltr" class="">Even after all the fixup attempts, there's still a failing clang-tools-extra test:<div class=""><br class=""></div><div class="">ninja: Entering directory `out/gn'<br class="">[0/2] ACTION //clang-tools-extra/test:check-clang-tools(//llvm/utils/gn/build/toolchain:unix)<br class="">-- Testing: 787 tests, 64 threads --<br class="">Testing: 0 .. 10<br class="">FAIL: Clang Tools :: clang-tidy/clang-tidy-__clang_analyzer__macro.cpp (112 of 787)<br class="">******************** TEST 'Clang Tools :: clang-tidy/clang-tidy-__clang_analyzer__macro.cpp' FAILED ********************<br class="">Script:<br class="">--<br class="">: 'RUN: at line 1'; clang-tidy /usr/local/google/home/thakis/src/llvm-project/clang-tools-extra/test/clang-tidy/clang-tidy-__clang_analyzer__macro.cpp -checks=-*,modernize-use-nullptr -- | count 0<br class="">--<br class="">Exit Code: 1<br class=""><br class="">Command Output (stderr):<br class="">--<br class="">1 error generated.<br class="">Error while processing /usr/local/google/home/thakis/src/llvm-project/clang-tools-extra/test/clang-tidy/clang-tidy-__clang_analyzer__macro.cpp.<br class="">Found compiler error(s).<br class="">Expected 0 lines, got 3.<br class=""><br class="">--<br class=""><br class="">********************<br class="">Testing: 0 .. 10.. 20.. 30.. 40.. 50.. 60.. 70.. 80.. 90.. <br class="">Testing Time: 4.11s<br class="">********************<br class="">Failing Tests (1):<br class=""> Clang Tools :: clang-tidy/clang-tidy-__clang_analyzer__macro.cpp<br class=""></div><div class=""><br class=""></div></div><br class=""><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Sep 23, 2019 at 8:31 PM Jan Korous via cfe-commits <<a href="mailto:cfe-commits@lists.llvm.org" class="">cfe-commits@lists.llvm.org</a>> wrote:<br class=""></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">Author: jkorous<br class="">
Date: Mon Sep 23 17:33:47 2019<br class="">
New Revision: 372679<br class="">
<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=372679&view=rev" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project?rev=372679&view=rev</a><br class="">
Log:<br class="">
[static analyzer] Define __clang_analyzer__ macro in driver<br class="">
<br class="">
Differential Revision: <a href="https://reviews.llvm.org/D67938" rel="noreferrer" target="_blank" class="">https://reviews.llvm.org/D67938</a><br class="">
<br class="">
Added:<br class="">
cfe/trunk/test/Analysis/misc-driver.c<br class="">
Modified:<br class="">
cfe/trunk/lib/Driver/ToolChains/Clang.cpp<br class="">
cfe/trunk/lib/Frontend/InitPreprocessor.cpp<br class="">
cfe/trunk/test/Analysis/misc-ps.m<br class="">
<br class="">
Modified: cfe/trunk/lib/Driver/ToolChains/Clang.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Clang.cpp?rev=372679&r1=372678&r2=372679&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/ToolChains/Clang.cpp?rev=372679&r1=372678&r2=372679&view=diff</a><br class="">
==============================================================================<br class="">
--- cfe/trunk/lib/Driver/ToolChains/Clang.cpp (original)<br class="">
+++ cfe/trunk/lib/Driver/ToolChains/Clang.cpp Mon Sep 23 17:33:47 2019<br class="">
@@ -3896,8 +3896,10 @@ void Clang::ConstructJob(Compilation &C,<br class="">
if (Args.hasArg(options::OPT_municode))<br class="">
CmdArgs.push_back("-DUNICODE");<br class="">
<br class="">
- if (isa<AnalyzeJobAction>(JA))<br class="">
+ if (isa<AnalyzeJobAction>(JA)) {<br class="">
RenderAnalyzerOptions(Args, CmdArgs, Triple, Input);<br class="">
+ CmdArgs.push_back("-D__clang_analyzer__");<br class="">
+ }<br class="">
<br class="">
// Enable compatilibily mode to avoid analyzer-config related errors.<br class="">
// Since we can't access frontend flags through hasArg, let's manually iterate<br class="">
<br class="">
Modified: cfe/trunk/lib/Frontend/InitPreprocessor.cpp<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitPreprocessor.cpp?rev=372679&r1=372678&r2=372679&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/InitPreprocessor.cpp?rev=372679&r1=372678&r2=372679&view=diff</a><br class="">
==============================================================================<br class="">
--- cfe/trunk/lib/Frontend/InitPreprocessor.cpp (original)<br class="">
+++ cfe/trunk/lib/Frontend/InitPreprocessor.cpp Mon Sep 23 17:33:47 2019<br class="">
@@ -990,10 +990,6 @@ static void InitializePredefinedMacros(c<br class="">
else if (LangOpts.getStackProtector() == LangOptions::SSPReq)<br class="">
Builder.defineMacro("__SSP_ALL__", "3");<br class="">
<br class="">
- // Define a macro that exists only when using the static analyzer.<br class="">
- if (FEOpts.ProgramAction == frontend::RunAnalysis)<br class="">
- Builder.defineMacro("__clang_analyzer__");<br class="">
-<br class="">
if (LangOpts.FastRelaxedMath)<br class="">
Builder.defineMacro("__FAST_RELAXED_MATH__");<br class="">
<br class="">
<br class="">
Added: cfe/trunk/test/Analysis/misc-driver.c<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/misc-driver.c?rev=372679&view=auto" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/misc-driver.c?rev=372679&view=auto</a><br class="">
==============================================================================<br class="">
--- cfe/trunk/test/Analysis/misc-driver.c (added)<br class="">
+++ cfe/trunk/test/Analysis/misc-driver.c Mon Sep 23 17:33:47 2019<br class="">
@@ -0,0 +1,5 @@<br class="">
+// RUN: %clang --analyze %s<br class="">
+<br class="">
+#ifndef __clang_analyzer__<br class="">
+#error __clang_analyzer__ not defined<br class="">
+#endif<br class="">
<br class="">
Modified: cfe/trunk/test/Analysis/misc-ps.m<br class="">
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/misc-ps.m?rev=372679&r1=372678&r2=372679&view=diff" rel="noreferrer" target="_blank" class="">http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Analysis/misc-ps.m?rev=372679&r1=372678&r2=372679&view=diff</a><br class="">
==============================================================================<br class="">
--- cfe/trunk/test/Analysis/misc-ps.m (original)<br class="">
+++ cfe/trunk/test/Analysis/misc-ps.m Mon Sep 23 17:33:47 2019<br class="">
@@ -2,10 +2,6 @@<br class="">
// 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<br class="">
// 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<br class="">
<br class="">
-#ifndef __clang_analyzer__<br class="">
-#error __clang_analyzer__ not defined<br class="">
-#endif<br class="">
-<br class="">
typedef struct objc_ivar *Ivar;<br class="">
typedef struct objc_selector *SEL;<br class="">
typedef signed char BOOL;<br class="">
<br class="">
<br class="">
_______________________________________________<br class="">
cfe-commits mailing list<br class="">
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank" class="">cfe-commits@lists.llvm.org</a><br class="">
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank" class="">https://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits</a><br class="">
</blockquote></div>
</div></blockquote></div><br class=""></div></body></html>