<div dir="ltr">Test? (Also below)<div class="gmail_extra"><br><div class="gmail_quote">On Tue, Mar 6, 2018 at 8:27 PM, Petr Hosek 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: phosek<br>
Date: Tue Mar  6 17:27:03 2018<br>
New Revision: 326860<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=326860&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=326860&view=rev</a><br>
Log:<br>
[Driver] Automatically disable incompatible default sanitizers<br>
<br>
When a sanitizer incompatible with one of the default sanitizers<br>
is explicitly enabled, automatically disable all the conflicting<br>
default sanitizers.<br>
<br>
Differential Revision: <a href="https://reviews.llvm.org/D44064" rel="noreferrer" target="_blank">https://reviews.llvm.org/<wbr>D44064</a><br>
<br>
Modified:<br>
    cfe/trunk/lib/Driver/<wbr>SanitizerArgs.cpp<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=326860&r1=326859&r2=326860&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/cfe/trunk/lib/Driver/<wbr>SanitizerArgs.cpp?rev=326860&<wbr>r1=326859&r2=326860&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- cfe/trunk/lib/Driver/<wbr>SanitizerArgs.cpp (original)<br>
+++ cfe/trunk/lib/Driver/<wbr>SanitizerArgs.cpp Tue Mar  6 17:27:03 2018<br>
@@ -332,8 +332,30 @@ SanitizerArgs::SanitizerArgs(<wbr>const ToolC<br>
     }<br>
   }<br>
<br>
+  std::pair<SanitizerMask, SanitizerMask> IncompatibleGroups[] = {<br>
+      std::make_pair(Address, Thread | Memory),<br>
+      std::make_pair(Thread, Memory),<br>
+      std::make_pair(Leak, Thread | Memory),<br>
+      std::make_pair(KernelAddress, Address | Leak | Thread | Memory),<br>
+      std::make_pair(HWAddress, Address | Thread | Memory | KernelAddress),<br>
+      std::make_pair(Efficiency, Address | HWAddress | Leak | Thread | Memory |<br>
+                                     KernelAddress),<br>
+      std::make_pair(Scudo, Address | HWAddress | Leak | Thread | Memory |<br>
+                                KernelAddress | Efficiency),<br>
+      std::make_pair(SafeStack, Address | HWAddress | Leak | Thread | Memory |<br>
+                                    KernelAddress | Efficiency)};<br>
+<br>
   // Enable toolchain specific default sanitizers if not explicitly disabled.<br>
-  Kinds |= TC.getDefaultSanitizers() & ~AllRemove;<br>
+  SanitizerMask Default = TC.getDefaultSanitizers() & ~AllRemove;<br>
+<br>
+  // Disable default sanitizers that are incompatible with the default ones.<br></blockquote><div><br></div><div>You probably mean "Disable default sanitizers that are incompatible with explicitly requested ones"?</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
+  for (auto G : IncompatibleGroups) {<br>
+    SanitizerMask Group = G.first;<br>
+    if ((Default & Group) && (Kinds & G.second))<br>
+      Default &= ~Group;<br>
+  }<br>
+<br>
+  Kinds |= Default;<br>
<br>
   // We disable the vptr sanitizer if it was enabled by group expansion but RTTI<br>
   // is disabled.<br>
@@ -369,18 +391,6 @@ SanitizerArgs::SanitizerArgs(<wbr>const ToolC<br>
   }<br>
<br>
   // Warn about incompatible groups of sanitizers.<br>
-  std::pair<SanitizerMask, SanitizerMask> IncompatibleGroups[] = {<br>
-      std::make_pair(Address, Thread | Memory),<br>
-      std::make_pair(Thread, Memory),<br>
-      std::make_pair(Leak, Thread | Memory),<br>
-      std::make_pair(KernelAddress, Address | Leak | Thread | Memory),<br>
-      std::make_pair(HWAddress, Address | Thread | Memory | KernelAddress),<br>
-      std::make_pair(Efficiency, Address | HWAddress | Leak | Thread | Memory |<br>
-                                     KernelAddress),<br>
-      std::make_pair(Scudo, Address | HWAddress | Leak | Thread | Memory |<br>
-                                KernelAddress | Efficiency),<br>
-      std::make_pair(SafeStack, Address | HWAddress | Leak | Thread | Memory |<br>
-                                    KernelAddress | Efficiency)};<br>
   for (auto G : IncompatibleGroups) {<br>
     SanitizerMask Group = G.first;<br>
     if (Kinds & Group) {<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></div>