<div dir="ltr">This patch fixes a libc++abi test failure when compiled with GCC 5, 6, or 7.<div>We should merge this into 4.0 to help get `check-all` clean.</div><div><br></div><div>/Eric</div></div><div class="gmail_extra"><br><div class="gmail_quote">On Fri, Jan 20, 2017 at 12:34 PM, Eric Fiselier 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: ericwf<br>
Date: Fri Jan 20 13:34:19 2017<br>
New Revision: 292638<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=292638&view=rev" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project?rev=292638&view=rev</a><br>
Log:<br>
Fix catch_reference_nullptr.pass.<wbr>cpp test for GCC.<br>
<br>
This test contained an implicit conversion from nullptr to bool.<br>
Clang warns about this but the test had supressed that warning.<br>
However GCC diagnoses the same code as an error and requires<br>
-fpermissive to accept it.<br>
<br>
This patch fixes both the warning and the error by explicitly<br>
converting the pointer to bool.<br>
<br>
Modified:<br>
    libcxxabi/trunk/test/catch_<wbr>reference_nullptr.pass.cpp<br>
<br>
Modified: libcxxabi/trunk/test/catch_<wbr>reference_nullptr.pass.cpp<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/libcxxabi/trunk/test/catch_reference_nullptr.pass.cpp?rev=292638&r1=292637&r2=292638&view=diff" rel="noreferrer" target="_blank">http://llvm.org/viewvc/llvm-<wbr>project/libcxxabi/trunk/test/<wbr>catch_reference_nullptr.pass.<wbr>cpp?rev=292638&r1=292637&r2=<wbr>292638&view=diff</a><br>
==============================<wbr>==============================<wbr>==================<br>
--- libcxxabi/trunk/test/catch_<wbr>reference_nullptr.pass.cpp (original)<br>
+++ libcxxabi/trunk/test/catch_<wbr>reference_nullptr.pass.cpp Fri Jan 20 13:34:19 2017<br>
@@ -12,12 +12,6 @@<br>
 #include <cassert><br>
 #include <cstdlib><br>
<br>
-// Clang emits a warning on converting an object of type nullptr_t to bool,<br>
-// even in generic code. Suppress it.<br>
-#if defined(__clang__)<br>
-#pragma clang diagnostic ignored "-Wnull-conversion"<br>
-#endif<br>
-<br>
 struct A {};<br>
<br>
 template<typename T, bool CanCatchNullptr><br>
@@ -25,7 +19,7 @@ static void catch_nullptr_test() {<br>
   try {<br>
     throw nullptr;<br>
   } catch (T &p) {<br>
-    assert(CanCatchNullptr && !p);<br>
+    assert(CanCatchNullptr && !static_cast<bool>(p));<br>
   } catch (...) {<br>
     assert(!CanCatchNullptr);<br>
   }<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>