diff options
| author | Roger Sayle <roger@eyesopen.com> | 2006-04-06 16:47:40 +0000 |
|---|---|---|
| committer | Roger Sayle <sayle@gcc.gnu.org> | 2006-04-06 16:47:40 +0000 |
| commit | 4b91b67bcb6ab749f530aec156a46188a388a518 (patch) | |
| tree | fd7a3c08d7f0205a9ddb7c18a52a076dcc41e6f4 | |
| parent | 06a103af0e61d634e1fa730a1865eb4e98748e72 (diff) | |
| download | gcc-4b91b67bcb6ab749f530aec156a46188a388a518.zip gcc-4b91b67bcb6ab749f530aec156a46188a388a518.tar.gz gcc-4b91b67bcb6ab749f530aec156a46188a388a518.tar.bz2 | |
call.c (null_ptr_cst_p): Add explicit TREE_CONSTANT_OVERFLOW check.
* call.c (null_ptr_cst_p): Add explicit TREE_CONSTANT_OVERFLOW check.
* g++.dg/conversion/nullptr1.C: New test case.
* g++.dg/conversion/nullptr2.C: Likewise.
From-SVN: r112734
| -rw-r--r-- | gcc/cp/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/cp/call.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/conversion/nullptr1.C | 10 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/conversion/nullptr2.C | 10 |
5 files changed, 32 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 96191a2..266e347 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,7 @@ +2006-04-06 Roger Sayle <roger@eyesopen.com> + + * call.c (null_ptr_cst_p): Add explicit TREE_CONSTANT_OVERFLOW check. + 2006-04-05 Jason Merrill <jason@redhat.com> * name-lookup.c (push_namespace_with_attribs): Temporarily disable diff --git a/gcc/cp/call.c b/gcc/cp/call.c index 268573d..0413a98 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -427,7 +427,9 @@ null_ptr_cst_p (tree t) (_expr.const_) rvalue of integer type that evaluates to zero. */ t = integral_constant_value (t); if (t == null_node - || (CP_INTEGRAL_TYPE_P (TREE_TYPE (t)) && integer_zerop (t))) + || (CP_INTEGRAL_TYPE_P (TREE_TYPE (t)) + && integer_zerop (t) + && !TREE_CONSTANT_OVERFLOW (t))) return true; return false; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index a9fa5b0..814f957 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2006-04-06 Roger Sayle <roger@eyesopen.com> + + * g++.dg/conversion/nullptr1.C: New test case. + * g++.dg/conversion/nullptr2.C: Likewise. + 2006-04-05 Roger Sayle <roger@eyesopen.com> * gfortran.dg/dependency_18.f90: New test case. diff --git a/gcc/testsuite/g++.dg/conversion/nullptr1.C b/gcc/testsuite/g++.dg/conversion/nullptr1.C new file mode 100644 index 0000000..6230a29 --- /dev/null +++ b/gcc/testsuite/g++.dg/conversion/nullptr1.C @@ -0,0 +1,10 @@ +/* Test for overflow in NULL pointer constant. */ +/* { dg-do compile } */ + +#include <limits.h> + +void *p = 0; + +void *q = 0 * (INT_MAX + 1); // { dg-error "invalid conversion" } + + diff --git a/gcc/testsuite/g++.dg/conversion/nullptr2.C b/gcc/testsuite/g++.dg/conversion/nullptr2.C new file mode 100644 index 0000000..74ceff4 --- /dev/null +++ b/gcc/testsuite/g++.dg/conversion/nullptr2.C @@ -0,0 +1,10 @@ +/* Test for enumeration as NULL pointer constant. */ +/* PR c++/14644 */ +/* { dg-do compile } */ + +enum { NULL = 0 }; + +void *p = 0; + +void *q = NULL; // { dg-error "cannot convert" } + |