r304697 - Revert "[sanitizer-coverage] one more flavor of coverage: -fsanitize-coverage=inline-8bit-counters. Experimental so far, not documenting yet. (clang part)"

Kostya Serebryany via cfe-commits cfe-commits at lists.llvm.org
Thu Jun 8 10:46:23 PDT 2017


Ah, I see https://bugs.llvm.org/show_bug.cgi?id=33308, moving the
discussion there.

On Thu, Jun 8, 2017 at 10:05 AM, Kostya Serebryany <kcc at google.com> wrote:

> How did it break it?
> Any logs?
>
> On Mon, Jun 5, 2017 at 12:35 AM, Renato Golin via cfe-commits <
> cfe-commits at lists.llvm.org> wrote:
>
>> Author: rengolin
>> Date: Mon Jun  5 02:35:45 2017
>> New Revision: 304697
>>
>> URL: http://llvm.org/viewvc/llvm-project?rev=304697&view=rev
>> Log:
>> Revert "[sanitizer-coverage] one more flavor of coverage:
>> -fsanitize-coverage=inline-8bit-counters. Experimental so far, not
>> documenting yet. (clang part)"
>>
>> This reverts commit r304631, as it broke ARM/AArch64 bots for 2 days.
>>
>> Modified:
>>     cfe/trunk/include/clang/Driver/CC1Options.td
>>     cfe/trunk/include/clang/Frontend/CodeGenOptions.def
>>     cfe/trunk/lib/CodeGen/BackendUtil.cpp
>>     cfe/trunk/lib/Driver/SanitizerArgs.cpp
>>     cfe/trunk/lib/Frontend/CompilerInvocation.cpp
>>     cfe/trunk/test/Driver/fsanitize-coverage.c
>>
>> Modified: cfe/trunk/include/clang/Driver/CC1Options.td
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/
>> Driver/CC1Options.td?rev=304697&r1=304696&r2=304697&view=diff
>> ============================================================
>> ==================
>> --- cfe/trunk/include/clang/Driver/CC1Options.td (original)
>> +++ cfe/trunk/include/clang/Driver/CC1Options.td Mon Jun  5 02:35:45 2017
>> @@ -293,9 +293,6 @@ def fsanitize_coverage_trace_gep
>>  def fsanitize_coverage_8bit_counters
>>      : Flag<["-"], "fsanitize-coverage-8bit-counters">,
>>        HelpText<"Enable frequency counters in sanitizer coverage">;
>> -def fsanitize_coverage_inline_8bit_counters
>> -    : Flag<["-"], "fsanitize-coverage-inline-8bit-counters">,
>> -      HelpText<"Enable inline 8-bit counters in sanitizer coverage">;
>>  def fsanitize_coverage_trace_pc
>>      : Flag<["-"], "fsanitize-coverage-trace-pc">,
>>        HelpText<"Enable PC tracing in sanitizer coverage">;
>>
>> Modified: cfe/trunk/include/clang/Frontend/CodeGenOptions.def
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/include/clang/
>> Frontend/CodeGenOptions.def?rev=304697&r1=304696&r2=304697&view=diff
>> ============================================================
>> ==================
>> --- cfe/trunk/include/clang/Frontend/CodeGenOptions.def (original)
>> +++ cfe/trunk/include/clang/Frontend/CodeGenOptions.def Mon Jun  5
>> 02:35:45 2017
>> @@ -163,7 +163,6 @@ CODEGENOPT(SanitizeCoverageTracePC, 1, 0
>>                                            ///< in sanitizer coverage.
>>  CODEGENOPT(SanitizeCoverageTracePCGuard, 1, 0) ///< Enable PC tracing
>> with guard
>>                                                 ///< in sanitizer
>> coverage.
>> -CODEGENOPT(SanitizeCoverageInline8bitCounters, 1, 0) ///< Use inline
>> 8bit counters.
>>  CODEGENOPT(SanitizeCoverageNoPrune, 1, 0) ///< Disable coverage pruning.
>>  CODEGENOPT(SanitizeStats     , 1, 0) ///< Collect statistics for
>> sanitizers.
>>  CODEGENOPT(SimplifyLibCalls  , 1, 1) ///< Set when -fbuiltin is enabled.
>>
>> Modified: cfe/trunk/lib/CodeGen/BackendUtil.cpp
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/Ba
>> ckendUtil.cpp?rev=304697&r1=304696&r2=304697&view=diff
>> ============================================================
>> ==================
>> --- cfe/trunk/lib/CodeGen/BackendUtil.cpp (original)
>> +++ cfe/trunk/lib/CodeGen/BackendUtil.cpp Mon Jun  5 02:35:45 2017
>> @@ -187,7 +187,6 @@ static void addSanitizerCoveragePass(con
>>    Opts.TracePC = CGOpts.SanitizeCoverageTracePC;
>>    Opts.TracePCGuard = CGOpts.SanitizeCoverageTracePCGuard;
>>    Opts.NoPrune = CGOpts.SanitizeCoverageNoPrune;
>> -  Opts.Inline8bitCounters = CGOpts.SanitizeCoverageInline8bitCounters;
>>    PM.add(createSanitizerCoverageModulePass(Opts));
>>  }
>>
>>
>> Modified: cfe/trunk/lib/Driver/SanitizerArgs.cpp
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/San
>> itizerArgs.cpp?rev=304697&r1=304696&r2=304697&view=diff
>> ============================================================
>> ==================
>> --- cfe/trunk/lib/Driver/SanitizerArgs.cpp (original)
>> +++ cfe/trunk/lib/Driver/SanitizerArgs.cpp Mon Jun  5 02:35:45 2017
>> @@ -48,14 +48,13 @@ enum CoverageFeature {
>>    CoverageBB = 1 << 1,
>>    CoverageEdge = 1 << 2,
>>    CoverageIndirCall = 1 << 3,
>> -  CoverageTraceBB = 1 << 4,  // Deprecated.
>> +  CoverageTraceBB = 1 << 4,
>>    CoverageTraceCmp = 1 << 5,
>>    CoverageTraceDiv = 1 << 6,
>>    CoverageTraceGep = 1 << 7,
>> -  Coverage8bitCounters = 1 << 8,  // Deprecated.
>> +  Coverage8bitCounters = 1 << 8,
>>    CoverageTracePC = 1 << 9,
>>    CoverageTracePCGuard = 1 << 10,
>> -  CoverageInline8bitCounters = 1 << 12,
>>    CoverageNoPrune = 1 << 11,
>>  };
>>
>> @@ -531,8 +530,7 @@ SanitizerArgs::SanitizerArgs(const ToolC
>>    }
>>
>>    // trace-pc w/o func/bb/edge implies edge.
>> -  if ((CoverageFeatures &
>> -       (CoverageTracePC | CoverageTracePCGuard |
>> CoverageInline8bitCounters)) &&
>> +  if ((CoverageFeatures & (CoverageTracePC | CoverageTracePCGuard)) &&
>>        !(CoverageFeatures & InsertionPointTypes))
>>      CoverageFeatures |= CoverageEdge;
>>
>> @@ -639,7 +637,6 @@ void SanitizerArgs::addArgs(const ToolCh
>>      std::make_pair(Coverage8bitCounters, "-fsanitize-coverage-8bit-coun
>> ters"),
>>      std::make_pair(CoverageTracePC, "-fsanitize-coverage-trace-pc"),
>>      std::make_pair(CoverageTracePCGuard, "-fsanitize-coverage-trace-pc-
>> guard"),
>> -    std::make_pair(CoverageInline8bitCounters,
>> "-fsanitize-coverage-inline-8bit-counters"),
>>      std::make_pair(CoverageNoPrune, "-fsanitize-coverage-no-prune")};
>>    for (auto F : CoverageFlags) {
>>      if (CoverageFeatures & F.first)
>> @@ -801,7 +798,6 @@ int parseCoverageFeatures(const Driver &
>>          .Case("trace-pc", CoverageTracePC)
>>          .Case("trace-pc-guard", CoverageTracePCGuard)
>>          .Case("no-prune", CoverageNoPrune)
>> -        .Case("inline-8bit-counters", CoverageInline8bitCounters)
>>          .Default(0);
>>      if (F == 0)
>>        D.Diag(clang::diag::err_drv_unsupported_option_argument)
>>
>> Modified: cfe/trunk/lib/Frontend/CompilerInvocation.cpp
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Frontend/
>> CompilerInvocation.cpp?rev=304697&r1=304696&r2=304697&view=diff
>> ============================================================
>> ==================
>> --- cfe/trunk/lib/Frontend/CompilerInvocation.cpp (original)
>> +++ cfe/trunk/lib/Frontend/CompilerInvocation.cpp Mon Jun  5 02:35:45
>> 2017
>> @@ -768,8 +768,6 @@ static bool ParseCodeGenArgs(CodeGenOpti
>>    Opts.SanitizeCoverageTracePCGuard =
>>        Args.hasArg(OPT_fsanitize_coverage_trace_pc_guard);
>>    Opts.SanitizeCoverageNoPrune = Args.hasArg(OPT_fsanitize_cove
>> rage_no_prune);
>> -  Opts.SanitizeCoverageInline8bitCounters =
>> -      Args.hasArg(OPT_fsanitize_coverage_inline_8bit_counters);
>>    Opts.SanitizeMemoryTrackOrigins =
>>        getLastArgIntValue(Args, OPT_fsanitize_memory_track_origins_EQ,
>> 0, Diags);
>>    Opts.SanitizeMemoryUseAfterDtor =
>>
>> Modified: cfe/trunk/test/Driver/fsanitize-coverage.c
>> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/fs
>> anitize-coverage.c?rev=304697&r1=304696&r2=304697&view=diff
>> ============================================================
>> ==================
>> --- cfe/trunk/test/Driver/fsanitize-coverage.c (original)
>> +++ cfe/trunk/test/Driver/fsanitize-coverage.c Mon Jun  5 02:35:45 2017
>> @@ -84,9 +84,6 @@
>>  // RUN: %clang -target x86_64-linux-gnu -fsanitize-coverage=no-prune,func,trace-pc-guard
>> %s -### 2>&1 | FileCheck %s --check-prefix=CHECK_NOPRUNE
>>  // CHECK_NOPRUNE: -fsanitize-coverage-no-prune
>>
>> -// RUN: %clang -target x86_64-linux-gnu -fsanitize-coverage=inline-8bit-counters
>> %s -### 2>&1 | FileCheck %s --check-prefix=CHECK_INLINE8BIT
>> -// CHECK_INLINE8BIT: -fsanitize-coverage-inline-8bit-counters
>> -
>>  // RUN: %clang_cl --target=i386-pc-win32 -fsanitize=address
>> -fsanitize-coverage=func,trace-pc-guard -c -### -- %s 2>&1 | FileCheck
>> %s -check-prefix=CLANG-CL-COVERAGE
>>  // CLANG-CL-COVERAGE-NOT: error:
>>  // CLANG-CL-COVERAGE-NOT: warning:
>>
>>
>> _______________________________________________
>> cfe-commits mailing list
>> cfe-commits at lists.llvm.org
>> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>>
>
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20170608/67529239/attachment.html>


More information about the cfe-commits mailing list