diff options
| author | Manuel López-Ibáñez <manu@gcc.gnu.org> | 2007-01-30 22:29:11 +0000 |
|---|---|---|
| committer | Manuel López-Ibáñez <manu@gcc.gnu.org> | 2007-01-30 22:29:11 +0000 |
| commit | b9edb4b11c99720e10625b41d37dc440bd468f2c (patch) | |
| tree | 6ab5f599b4f4444b77112bd54a7ebdc103ca2f51 /gcc/cp/typeck.c | |
| parent | 14734fc701357c82967954578c822f3ddede043f (diff) | |
| download | gcc-b9edb4b11c99720e10625b41d37dc440bd468f2c.zip gcc-b9edb4b11c99720e10625b41d37dc440bd468f2c.tar.gz gcc-b9edb4b11c99720e10625b41d37dc440bd468f2c.tar.bz2 | |
re PR c++/24745 (unpleasant warning for "if (NULL)")
2007-01-30 Manuel Lopez-Ibanez <manu@gcc.gnu.org>
PR c++/24745
* doc/invoke.texi (Wpointer-arith): Document warning.
cp/
* typeck.c (build_binary_op): Fix logic for warning. Move warning
to -Wpointer-arith.
* call.c (convert_like_real): Don't warn when converting to
boolean type.
testsuite/
* g++.dg/warn/null4.C: New.
From-SVN: r121361
Diffstat (limited to 'gcc/cp/typeck.c')
| -rw-r--r-- | gcc/cp/typeck.c | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 709d25b..829b867 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -3828,30 +3828,28 @@ build_binary_op (enum tree_code code, tree orig_op0, tree orig_op1, } } - /* If CONVERTED is zero, both args will be converted to type RESULT_TYPE. - Then the expression will be built. - It will be given type FINAL_TYPE if that is nonzero; - otherwise, it will be given type RESULT_TYPE. */ - /* Issue warnings about peculiar, but valid, uses of NULL. */ - if (/* It's reasonable to use pointer values as operands of && + if ((orig_op0 == null_node || orig_op1 == null_node) + /* It's reasonable to use pointer values as operands of && and ||, so NULL is no exception. */ - !(code == TRUTH_ANDIF_EXPR || code == TRUTH_ORIF_EXPR) - && (/* If OP0 is NULL and OP1 is not a pointer, or vice versa. */ - (orig_op0 == null_node - && TREE_CODE (TREE_TYPE (op1)) != POINTER_TYPE) - /* Or vice versa. */ - || (orig_op1 == null_node - && TREE_CODE (TREE_TYPE (op0)) != POINTER_TYPE) - /* Or, both are NULL and the operation was not a comparison. */ - || (orig_op0 == null_node && orig_op1 == null_node - && code != EQ_EXPR && code != NE_EXPR))) + && code != TRUTH_ANDIF_EXPR && code != TRUTH_ORIF_EXPR + && ( /* Both are NULL (or 0) and the operation was not a comparison. */ + (null_ptr_cst_p (orig_op0) && null_ptr_cst_p (orig_op1) + && code != EQ_EXPR && code != NE_EXPR) + /* Or if one of OP0 or OP1 is neither a pointer nor NULL. */ + || (!null_ptr_cst_p (orig_op0) && TREE_CODE (TREE_TYPE (op0)) != POINTER_TYPE) + || (!null_ptr_cst_p (orig_op1) && TREE_CODE (TREE_TYPE (op1)) != POINTER_TYPE))) /* Some sort of arithmetic operation involving NULL was performed. Note that pointer-difference and pointer-addition have already been handled above, and so we don't end up here in that case. */ - warning (0, "NULL used in arithmetic"); + warning (OPT_Wpointer_arith, "NULL used in arithmetic"); + + /* If CONVERTED is zero, both args will be converted to type RESULT_TYPE. + Then the expression will be built. + It will be given type FINAL_TYPE if that is nonzero; + otherwise, it will be given type RESULT_TYPE. */ if (! converted) { if (TREE_TYPE (op0) != result_type) |