<div dir="ltr">Ah, I see <a href="https://bugs.llvm.org/show_bug.cgi?id=33308">https://bugs.llvm.org/show_bug.cgi?id=33308</a>, moving the discussion there. </div><div class="gmail_extra"><br><div class="gmail_quote">On Thu, Jun 8, 2017 at 10:05 AM, Kostya Serebryany <span dir="ltr"><<a href="mailto:kcc@google.com" target="_blank">kcc@google.com</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex"><div dir="ltr">How did it break it? <div>Any logs? </div></div><div class="HOEnZb"><div class="h5"><div class="gmail_extra"><br><div class="gmail_quote">On Mon, Jun 5, 2017 at 12:35 AM, Renato Golin via cfe-commits <span dir="ltr"><<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a>></span> wrote:<br><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: rengolin<br>
Date: Mon Jun 5 02:35:45 2017<br>
New Revision: 304697<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=304697&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject?rev=304697&view=rev</a><br>
Log:<br>
Revert "[sanitizer-coverage] one more flavor of coverage: -fsanitize-coverage=inline-8bi<wbr>t-counters. Experimental so far, not documenting yet. (clang part)"<br>
<br>
This reverts commit r304631, as it broke ARM/AArch64 bots for 2 days.<br>
<br>
Modified:<br>
cfe/trunk/include/clang/Driver<wbr>/CC1Options.td<br>
cfe/trunk/include/clang/Fronte<wbr>nd/CodeGenOptions.def<br>
cfe/trunk/lib/CodeGen/BackendU<wbr>til.cpp<br>
cfe/trunk/lib/Driver/Sanitizer<wbr>Args.cpp<br>
cfe/trunk/lib/Frontend/Compile<wbr>rInvocation.cpp<br>
cfe/trunk/test/Driver/fsanitiz<wbr>e-coverage.c<br>
<br>
Modified: cfe/trunk/include/clang/Driver<wbr>/CC1Options.td<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Driver/CC1Options.td?rev=304697&r1=304696&r2=304697&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/cfe/trunk/include/clang/<wbr>Driver/CC1Options.td?rev=<wbr>304697&r1=304696&r2=304697&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/include/clang/Driver<wbr>/CC1Options.td (original)<br>
+++ cfe/trunk/include/clang/Driver<wbr>/CC1Options.td Mon Jun 5 02:35:45 2017<br>
@@ -293,9 +293,6 @@ def fsanitize_coverage_trace_gep<br>
def fsanitize_coverage_8bit_counte<wbr>rs<br>
: Flag<["-"], "fsanitize-coverage-8bit-count<wbr>ers">,<br>
HelpText<"Enable frequency counters in sanitizer coverage">;<br>
-def fsanitize_coverage_inline_8bit<wbr>_counters<br>
- : Flag<["-"], "fsanitize-coverage-inline-8bi<wbr>t-counters">,<br>
- HelpText<"Enable inline 8-bit counters in sanitizer coverage">;<br>
def fsanitize_coverage_trace_pc<br>
: Flag<["-"], "fsanitize-coverage-trace-pc"><wbr>,<br>
HelpText<"Enable PC tracing in sanitizer coverage">;<br>
<br>
Modified: cfe/trunk/include/clang/Fronte<wbr>nd/CodeGenOptions.def<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/Frontend/CodeGenOptions.def?rev=304697&r1=304696&r2=304697&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/cfe/trunk/include/clang/<wbr>Frontend/CodeGenOptions.def?<wbr>rev=304697&r1=304696&r2=304697<wbr>&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/include/clang/Fronte<wbr>nd/CodeGenOptions.def (original)<br>
+++ cfe/trunk/include/clang/Fronte<wbr>nd/CodeGenOptions.def Mon Jun 5 02:35:45 2017<br>
@@ -163,7 +163,6 @@ CODEGENOPT(SanitizeCoverageTra<wbr>cePC, 1, 0<br>
///< in sanitizer coverage.<br>
CODEGENOPT(SanitizeCoverageTr<wbr>acePCGuard, 1, 0) ///< Enable PC tracing with guard<br>
///< in sanitizer coverage.<br>
-CODEGENOPT(SanitizeCoverageIn<wbr>line8bitCounters, 1, 0) ///< Use inline 8bit counters.<br>
CODEGENOPT(SanitizeCoverageNo<wbr>Prune, 1, 0) ///< Disable coverage pruning.<br>
CODEGENOPT(SanitizeStats , 1, 0) ///< Collect statistics for sanitizers.<br>
CODEGENOPT(SimplifyLibCalls , 1, 1) ///< Set when -fbuiltin is enabled.<br>
<br>
Modified: cfe/trunk/lib/CodeGen/BackendU<wbr>til.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/BackendUtil.cpp?rev=304697&r1=304696&r2=304697&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/cfe/trunk/lib/CodeGen/Ba<wbr>ckendUtil.cpp?rev=304697&r1=30<wbr>4696&r2=304697&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/CodeGen/BackendU<wbr>til.cpp (original)<br>
+++ cfe/trunk/lib/CodeGen/BackendU<wbr>til.cpp Mon Jun 5 02:35:45 2017<br>
@@ -187,7 +187,6 @@ static void addSanitizerCoveragePass(con<br>
Opts.TracePC = CGOpts.SanitizeCoverageTracePC<wbr>;<br>
Opts.TracePCGuard = CGOpts.SanitizeCoverageTracePC<wbr>Guard;<br>
Opts.NoPrune = CGOpts.SanitizeCoverageNoPrune<wbr>;<br>
- Opts.Inline8bitCounters = CGOpts.SanitizeCoverageInline8<wbr>bitCounters;<br>
PM.add(createSanitizerCoverag<wbr>eModulePass(Opts));<br>
}<br>
<br>
<br>
Modified: cfe/trunk/lib/Driver/Sanitizer<wbr>Args.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/SanitizerArgs.cpp?rev=304697&r1=304696&r2=304697&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/cfe/trunk/lib/Driver/San<wbr>itizerArgs.cpp?rev=304697&r1=<wbr>304696&r2=304697&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Driver/Sanitizer<wbr>Args.cpp (original)<br>
+++ cfe/trunk/lib/Driver/Sanitizer<wbr>Args.cpp Mon Jun 5 02:35:45 2017<br>
@@ -48,14 +48,13 @@ enum CoverageFeature {<br>
CoverageBB = 1 << 1,<br>
CoverageEdge = 1 << 2,<br>
CoverageIndirCall = 1 << 3,<br>
- CoverageTraceBB = 1 << 4, // Deprecated.<br>
+ CoverageTraceBB = 1 << 4,<br>
CoverageTraceCmp = 1 << 5,<br>
CoverageTraceDiv = 1 << 6,<br>
CoverageTraceGep = 1 << 7,<br>
- Coverage8bitCounters = 1 << 8, // Deprecated.<br>
+ Coverage8bitCounters = 1 << 8,<br>
CoverageTracePC = 1 << 9,<br>
CoverageTracePCGuard = 1 << 10,<br>
- CoverageInline8bitCounters = 1 << 12,<br>
CoverageNoPrune = 1 << 11,<br>
};<br>
<br>
@@ -531,8 +530,7 @@ SanitizerArgs::SanitizerArgs(c<wbr>onst ToolC<br>
}<br>
<br>
// trace-pc w/o func/bb/edge implies edge.<br>
- if ((CoverageFeatures &<br>
- (CoverageTracePC | CoverageTracePCGuard | CoverageInline8bitCounters)) &&<br>
+ if ((CoverageFeatures & (CoverageTracePC | CoverageTracePCGuard)) &&<br>
!(CoverageFeatures & InsertionPointTypes))<br>
CoverageFeatures |= CoverageEdge;<br>
<br>
@@ -639,7 +637,6 @@ void SanitizerArgs::addArgs(const ToolCh<br>
std::make_pair(Coverage8bitCo<wbr>unters, "-fsanitize-coverage-8bit-coun<wbr>ters"),<br>
std::make_pair(CoverageTraceP<wbr>C, "-fsanitize-coverage-trace-pc"<wbr>),<br>
std::make_pair(CoverageTraceP<wbr>CGuard, "-fsanitize-coverage-trace-pc-<wbr>guard"),<br>
- std::make_pair(CoverageInline8<wbr>bitCounters, "-fsanitize-coverage-inline-8b<wbr>it-counters"),<br>
std::make_pair(CoverageNoPrun<wbr>e, "-fsanitize-coverage-no-prune"<wbr>)};<br>
for (auto F : CoverageFlags) {<br>
if (CoverageFeatures & F.first)<br>
@@ -801,7 +798,6 @@ int parseCoverageFeatures(const Driver &<br>
.Case("trace-pc", CoverageTracePC)<br>
.Case("trace-pc-guard", CoverageTracePCGuard)<br>
.Case("no-prune", CoverageNoPrune)<br>
- .Case("inline-8bit-counters", CoverageInline8bitCounters)<br>
.Default(0);<br>
if (F == 0)<br>
D.Diag(clang::diag::err_drv_u<wbr>nsupported_option_argument)<br>
<br>
Modified: cfe/trunk/lib/Frontend/Compile<wbr>rInvocation.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/CompilerInvocation.cpp?rev=304697&r1=304696&r2=304697&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/cfe/trunk/lib/Frontend/<wbr>CompilerInvocation.cpp?rev=<wbr>304697&r1=304696&r2=304697&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Frontend/Compile<wbr>rInvocation.cpp (original)<br>
+++ cfe/trunk/lib/Frontend/Compile<wbr>rInvocation.cpp Mon Jun 5 02:35:45 2017<br>
@@ -768,8 +768,6 @@ static bool ParseCodeGenArgs(CodeGenOpti<br>
Opts.SanitizeCoverageTracePCG<wbr>uard =<br>
Args.hasArg(OPT_fsanitize_cov<wbr>erage_trace_pc_guard);<br>
Opts.SanitizeCoverageNoPrune = Args.hasArg(OPT_fsanitize_cove<wbr>rage_no_prune);<br>
- Opts.SanitizeCoverageInline8bi<wbr>tCounters =<br>
- Args.hasArg(OPT_fsanitize_cove<wbr>rage_inline_8bit_counters);<br>
Opts.SanitizeMemoryTrackOrigi<wbr>ns =<br>
getLastArgIntValue(Args, OPT_fsanitize_memory_track_ori<wbr>gins_EQ, 0, Diags);<br>
Opts.SanitizeMemoryUseAfterDt<wbr>or =<br>
<br>
Modified: cfe/trunk/test/Driver/fsanitiz<wbr>e-coverage.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/fsanitize-coverage.c?rev=304697&r1=304696&r2=304697&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-pr<wbr>oject/cfe/trunk/test/Driver/fs<wbr>anitize-coverage.c?rev=304697&<wbr>r1=304696&r2=304697&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/fsanitiz<wbr>e-coverage.c (original)<br>
+++ cfe/trunk/test/Driver/fsanitiz<wbr>e-coverage.c Mon Jun 5 02:35:45 2017<br>
@@ -84,9 +84,6 @@<br>
// RUN: %clang -target x86_64-linux-gnu -fsanitize-coverage=no-prune,f<wbr>unc,trace-pc-guard %s -### 2>&1 | FileCheck %s --check-prefix=CHECK_NOPRUNE<br>
// CHECK_NOPRUNE: -fsanitize-coverage-no-prune<br>
<br>
-// RUN: %clang -target x86_64-linux-gnu -fsanitize-coverage=inline-8bi<wbr>t-counters %s -### 2>&1 | FileCheck %s --check-prefix=CHECK_INLINE8BI<wbr>T<br>
-// CHECK_INLINE8BIT: -fsanitize-coverage-inline-8bi<wbr>t-counters<br>
-<br>
// RUN: %clang_cl --target=i386-pc-win32 -fsanitize=address -fsanitize-coverage=func,trace<wbr>-pc-guard -c -### -- %s 2>&1 | FileCheck %s -check-prefix=CLANG-CL-COVERAG<wbr>E<br>
// CLANG-CL-COVERAGE-NOT: error:<br>
// CLANG-CL-COVERAGE-NOT: warning:<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org" target="_blank">cfe-commits@lists.llvm.org</a><br>
<a href="http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits" rel="noreferrer" target="_blank">http://lists.llvm.org/cgi-bin/<wbr>mailman/listinfo/cfe-commits</a><br>
</blockquote></div><br></div>
</div></div></blockquote></div><br></div>