<div dir="ltr">This broke a WinASan test that builds with -Werror:<div><a href="http://lab.llvm.org:8011/builders/sanitizer-windows/builds/10647">http://lab.llvm.org:8011/builders/sanitizer-windows/builds/10647</a><br></div><div><br></div><div>I tried to fix it in r302043, but I haven't finished testing it yet.</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Tue, May 2, 2017 at 6:27 PM, Kostya Serebryany 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: kcc<br>
Date: Tue May  2 20:27:28 2017<br>
New Revision: 301994<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=301994&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=301994&view=rev</a><br>
Log:<br>
[sanitizer-coverage] add a deprecation warning to the old sanitizer-coverage flag combinations<br>
<br>
Modified:<br>
    cfe/trunk/lib/Driver/<wbr>SanitizerArgs.cpp<br>
    cfe/trunk/test/Driver/<wbr>fsanitize-coverage.c<br>
<br>
Modified: cfe/trunk/lib/Driver/<wbr>SanitizerArgs.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Driver/SanitizerArgs.cpp?rev=301994&r1=301993&r2=301994&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Driver/<wbr>SanitizerArgs.cpp?rev=301994&<wbr>r1=301993&r2=301994&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Driver/<wbr>SanitizerArgs.cpp (original)<br>
+++ cfe/trunk/lib/Driver/<wbr>SanitizerArgs.cpp Tue May  2 20:27:28 2017<br>
@@ -511,7 +511,6 @@ SanitizerArgs::SanitizerArgs(<wbr>const ToolC<br>
         << "-fsanitize-coverage=edge";<br>
   // Basic block tracing and 8-bit counters require some type of coverage<br>
   // enabled.<br>
-  int CoverageTypes = CoverageFunc | CoverageBB | CoverageEdge;<br>
   if (CoverageFeatures & CoverageTraceBB)<br>
     D.Diag(clang::diag::warn_drv_<wbr>deprecated_arg)<br>
         << "-fsanitize-coverage=trace-bb"<br>
@@ -520,9 +519,18 @@ SanitizerArgs::SanitizerArgs(<wbr>const ToolC<br>
     D.Diag(clang::diag::warn_drv_<wbr>deprecated_arg)<br>
         << "-fsanitize-coverage=8bit-<wbr>counters"<br>
         << "-fsanitize-coverage=trace-pc-<wbr>guard";<br>
+<br>
+  int InsertionPointTypes = CoverageFunc | CoverageBB | CoverageEdge;<br>
+  if ((CoverageFeatures & InsertionPointTypes) &&<br>
+      !(CoverageFeatures &(CoverageTracePC | CoverageTracePCGuard))) {<br>
+    D.Diag(clang::diag::warn_drv_<wbr>deprecated_arg)<br>
+        << "-fsanitize-coverage=[func|bb|<wbr>edge]"<br>
+        << "-fsanitize-coverage=[func|bb|<wbr>edge],[trace-pc-guard|trace-<wbr>pc]";<br>
+  }<br>
+<br>
   // trace-pc w/o func/bb/edge implies edge.<br>
   if ((CoverageFeatures & (CoverageTracePC | CoverageTracePCGuard)) &&<br>
-      !(CoverageFeatures & CoverageTypes))<br>
+      !(CoverageFeatures & InsertionPointTypes))<br>
     CoverageFeatures |= CoverageEdge;<br>
<br>
   if (AllAddedKinds & Address) {<br>
<br>
Modified: cfe/trunk/test/Driver/<wbr>fsanitize-coverage.c<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Driver/fsanitize-coverage.c?rev=301994&r1=301993&r2=301994&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/test/Driver/<wbr>fsanitize-coverage.c?rev=<wbr>301994&r1=301993&r2=301994&<wbr>view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/test/Driver/<wbr>fsanitize-coverage.c (original)<br>
+++ cfe/trunk/test/Driver/<wbr>fsanitize-coverage.c Tue May  2 20:27:28 2017<br>
@@ -4,12 +4,13 @@<br>
 // CHECK-SANITIZE-COVERAGE-0-NOT: fsanitize-coverage-type<br>
 // CHECK-SANITIZE-COVERAGE-0: -fsanitize=address<br>
<br>
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=address -fsanitize-coverage=func %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FUNC<br>
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=memory -fsanitize-coverage=func %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FUNC<br>
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=leak -fsanitize-coverage=func %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FUNC<br>
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=undefined -fsanitize-coverage=func %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FUNC<br>
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=bool -fsanitize-coverage=func %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FUNC<br>
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=dataflow -fsanitize-coverage=func %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FUNC<br>
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=address -fsanitize-coverage=func,<wbr>trace-pc %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FUNC<br>
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=memory -fsanitize-coverage=func,<wbr>trace-pc %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FUNC<br>
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=leak -fsanitize-coverage=func,<wbr>trace-pc %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FUNC<br>
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=undefined -fsanitize-coverage=func,<wbr>trace-pc %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FUNC<br>
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=bool -fsanitize-coverage=func,<wbr>trace-pc %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FUNC<br>
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=dataflow -fsanitize-coverage=func,<wbr>trace-pc %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FUNC<br>
+// RUN: %clang -target x86_64-linux-gnu                     -fsanitize-coverage=func,<wbr>trace-pc %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FUNC<br>
 // CHECK-SANITIZE-COVERAGE-FUNC: fsanitize-coverage-type=1<br>
<br>
 // RUN: %clang -target x86_64-linux-gnu -fsanitize=address -fsanitize-coverage=bb %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-BB<br>
@@ -25,13 +26,10 @@<br>
 // RUN: %clang -target x86_64-linux-gnu -fsanitize=address -fsanitize-coverage=1 %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-1<br>
 // CHECK-SANITIZE-COVERAGE-1: warning: argument '-fsanitize-coverage=1' is deprecated, use '-fsanitize-coverage=trace-pc-<wbr>guard' instead<br>
<br>
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=thread   -fsanitize-coverage=func %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-UNUSED<br>
-// RUN: %clang -target x86_64-linux-gnu                     -fsanitize-coverage=func %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FUNC<br>
-// CHECK-SANITIZE-COVERAGE-<wbr>UNUSED: argument unused during compilation: '-fsanitize-coverage=func'<br>
-// CHECK-SANITIZE-COVERAGE-<wbr>UNUSED-NOT: -fsanitize-coverage-type=1<br>
-<br>
-// RUN: %clang -target x86_64-linux-gnu -fsanitize=address -fsanitize-coverage=func -fno-sanitize=address %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-SAN-DISABLED<br>
-// CHECK-SANITIZE-COVERAGE-SAN-<wbr>DISABLED-NOT: argument unused<br>
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=address -fsanitize-coverage=func %s -### 2>&1 | FileCheck %s --check-prefix=CHECK_FUNC_BB_<wbr>EDGE_DEPRECATED<br>
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=address -fsanitize-coverage=bb %s -### 2>&1 | FileCheck %s --check-prefix=CHECK_FUNC_BB_<wbr>EDGE_DEPRECATED<br>
+// RUN: %clang -target x86_64-linux-gnu -fsanitize=address -fsanitize-coverage=edge %s -### 2>&1 | FileCheck %s --check-prefix=CHECK_FUNC_BB_<wbr>EDGE_DEPRECATED<br>
+// CHECK_FUNC_BB_EDGE_DEPRECATED: warning: argument '-fsanitize-coverage=[func|bb|<wbr>edge]' is deprecated, use '-fsanitize-coverage=[func|bb|<wbr>edge],[trace-pc-guard|trace-<wbr>pc]' instead<br>
<br>
 // RUN: %clang -target x86_64-linux-gnu -fsanitize=address -fsanitize-coverage=edge,<wbr>indirect-calls,trace-pc,trace-<wbr>cmp,trace-div,trace-gep %s -### 2>&1 | FileCheck %s --check-prefix=CHECK-SANITIZE-<wbr>COVERAGE-FEATURES<br>
 // CHECK-SANITIZE-COVERAGE-<wbr>FEATURES: -fsanitize-coverage-type=3<br>
@@ -82,7 +80,7 @@<br>
 // CHECK-EXTEND-LEGACY: -fsanitize-coverage-type=1<br>
 // CHECK-EXTEND-LEGACY: -fsanitize-coverage-trace-cmp<br>
<br>
-// RUN: %clang_cl --target=i386-pc-win32 -fsanitize=address -fsanitize-coverage=func -c -### -- %s 2>&1 | FileCheck %s -check-prefix=CLANG-CL-<wbr>COVERAGE<br>
+// RUN: %clang_cl --target=i386-pc-win32 -fsanitize=address -fsanitize-coverage=func,<wbr>trace-pc-guard -c -### -- %s 2>&1 | FileCheck %s -check-prefix=CLANG-CL-<wbr>COVERAGE<br>
 // CLANG-CL-COVERAGE-NOT: error:<br>
 // CLANG-CL-COVERAGE-NOT: warning:<br>
 // CLANG-CL-COVERAGE-NOT: argument unused<br>
<br>
<br>
______________________________<wbr>_________________<br>
cfe-commits mailing list<br>
<a href="mailto:cfe-commits@lists.llvm.org">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>