From: Paolo Carlini <paolo.carlini@oracle.com>
To: "gcc-patches@gcc.gnu.org" <gcc-patches@gcc.gnu.org>
Cc: Jason Merrill <jason@redhat.com>
Subject: [C++ Patch/RFC] PR 43906
Date: Mon, 04 Aug 2014 16:24:00 -0000 [thread overview]
Message-ID: <53DFB3AE.1030706@oracle.com> (raw)
[-- Attachment #1: Type: text/plain, Size: 467 bytes --]
Hi,
I suppose we can quickly resolve, one way or another, this rather old
issue. Considering:
extern void z();
void h() { if ( z != (void*)0 ); }
we -Waddress warn in C and we don't in C++, due to the rather subtle
differences between null_pointer_constant_p and null_ptr_cst_p. I
believe we could as well warn in C++ too, but then I'm afraid we have to
handle the case specially, like in the below. What do you think?
Thanks!
Paolo.
//////////////////////
[-- Attachment #2: patch_43906 --]
[-- Type: text/plain, Size: 2442 bytes --]
Index: cp/typeck.c
===================================================================
--- cp/typeck.c (revision 213573)
+++ cp/typeck.c (working copy)
@@ -4353,12 +4353,11 @@ cp_build_binary_op (location_t location,
&& (code1 == INTEGER_TYPE || code1 == REAL_TYPE
|| code1 == COMPLEX_TYPE || code1 == ENUMERAL_TYPE))
short_compare = 1;
- else if ((code0 == POINTER_TYPE && code1 == POINTER_TYPE)
- || (TYPE_PTRDATAMEM_P (type0) && TYPE_PTRDATAMEM_P (type1)))
- result_type = composite_pointer_type (type0, type1, op0, op1,
- CPO_COMPARISON, complain);
else if ((code0 == POINTER_TYPE || TYPE_PTRDATAMEM_P (type0))
- && null_ptr_cst_p (op1))
+ && (null_ptr_cst_p (op1)
+ /* Handle (void*)0 too. */
+ || (TYPE_PTR_P (type1) && VOID_TYPE_P (TREE_TYPE (type1))
+ && integer_zerop (op1))))
{
if (TREE_CODE (op0) == ADDR_EXPR
&& decl_with_nonnull_addr_p (TREE_OPERAND (op0, 0)))
@@ -4371,7 +4370,10 @@ cp_build_binary_op (location_t location,
result_type = type0;
}
else if ((code1 == POINTER_TYPE || TYPE_PTRDATAMEM_P (type1))
- && null_ptr_cst_p (op0))
+ && (null_ptr_cst_p (op0)
+ /* Handle (void*)0 too. */
+ || (TYPE_PTR_P (type0) && VOID_TYPE_P (TREE_TYPE (type0))
+ && integer_zerop (op0))))
{
if (TREE_CODE (op1) == ADDR_EXPR
&& decl_with_nonnull_addr_p (TREE_OPERAND (op1, 0)))
@@ -4383,6 +4385,10 @@ cp_build_binary_op (location_t location,
}
result_type = type1;
}
+ else if ((code0 == POINTER_TYPE && code1 == POINTER_TYPE)
+ || (TYPE_PTRDATAMEM_P (type0) && TYPE_PTRDATAMEM_P (type1)))
+ result_type = composite_pointer_type (type0, type1, op0, op1,
+ CPO_COMPARISON, complain);
else if (null_ptr_cst_p (op0) && null_ptr_cst_p (op1))
/* One of the operands must be of nullptr_t type. */
result_type = TREE_TYPE (nullptr_node);
Index: testsuite/g++.dg/warn/Waddress-1.C
===================================================================
--- testsuite/g++.dg/warn/Waddress-1.C (revision 0)
+++ testsuite/g++.dg/warn/Waddress-1.C (working copy)
@@ -0,0 +1,7 @@
+// PR c++/43906
+// { dg-options "-Waddress" }
+
+extern void z();
+void f() { if ( z ) z(); } // { dg-warning "address" }
+void g() { if ( z != 0 ) z(); } // { dg-warning "address" }
+void h() { if ( z != (void*)0 ) z(); } // { dg-warning "address" }
next reply other threads:[~2014-08-04 16:24 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-08-04 16:24 Paolo Carlini [this message]
2014-08-04 20:45 ` Jason Merrill
2014-08-04 23:01 ` Paolo Carlini
2014-08-05 1:58 ` Jason Merrill
2014-08-05 11:49 ` Paolo Carlini
2014-08-05 12:10 ` Paolo Carlini
2014-08-05 12:33 ` Jason Merrill
2014-08-05 14:48 ` Paolo Carlini
2014-08-06 15:19 ` Jason Merrill
2014-08-06 17:07 ` Paolo Carlini
2014-08-06 18:20 ` Jason Merrill
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=53DFB3AE.1030706@oracle.com \
--to=paolo.carlini@oracle.com \
--cc=gcc-patches@gcc.gnu.org \
--cc=jason@redhat.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).