From: Paolo Carlini <paolo.carlini@oracle.com>
Date: Fri, 4 Nov 2011 16:31:18 +0000 (+0000)
Subject: re PR c++/48420 (Missed -Wconversion-null warning when passing const bool to T*)
X-Git-Tag: releases/gcc-4.7.0~2484
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=92b4d64cd44cbf3ecdc9be35099ed8692e3fc7ab;p=thirdparty%2Fgcc.git

re PR c++/48420 (Missed -Wconversion-null warning when passing const bool to T*)

/cp
2011-11-04  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/48420
	* call.c (conversion_null_warnings): For 'false' to NULL pointer,
	just check that TREE_TYPE (expr) is a BOOLEAN_TYPE.

/testsuite
2011-11-04  Paolo Carlini  <paolo.carlini@oracle.com>

	PR c++/48420
	* g++.dg/warn/Wconversion-null-3.C: New.

From-SVN: r180963
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 01d2f91a3b68..47e79fe9c5ab 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2011-11-04  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/48420
+	* call.c (conversion_null_warnings): For 'false' to NULL pointer,
+	just check that TREE_TYPE (expr) is a BOOLEAN_TYPE.
+
 2011-11-04  Ed Smith-Rowland  <3dw4rd@verizon.net>
 
 	PR c++/50941
diff --git a/gcc/cp/call.c b/gcc/cp/call.c
index 4d7facc6cda1..2bf22f96ed89 100644
--- a/gcc/cp/call.c
+++ b/gcc/cp/call.c
@@ -5544,7 +5544,8 @@ conversion_null_warnings (tree totype, tree expr, tree fn, int argnum)
     }
 
   /* Issue warnings if "false" is converted to a NULL pointer */
-  else if (expr == boolean_false_node && TYPE_PTR_P (totype))
+  else if (TREE_CODE (TREE_TYPE (expr)) == BOOLEAN_TYPE
+	   && TYPE_PTR_P (totype))
     {
       if (fn)
 	warning_at (input_location, OPT_Wconversion_null,
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 02f400e6571b..d5a6ea510d6a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-11-04  Paolo Carlini  <paolo.carlini@oracle.com>
+
+	PR c++/48420
+	* g++.dg/warn/Wconversion-null-3.C: New.
+
 2011-11-04  Ed Smith-Rowland  <3dw4rd@verizon.net>
 
 	PR c++/50941
diff --git a/gcc/testsuite/g++.dg/warn/Wconversion-null-3.C b/gcc/testsuite/g++.dg/warn/Wconversion-null-3.C
new file mode 100644
index 000000000000..1942ee270bf3
--- /dev/null
+++ b/gcc/testsuite/g++.dg/warn/Wconversion-null-3.C
@@ -0,0 +1,8 @@
+// PR c++/48420
+
+void foo(int* p);
+
+void bar() {
+  const bool kDebugMode = false;
+  foo(kDebugMode);   // { dg-warning "converting 'false'" }
+}