diff options
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/class.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/warn/Wzero-as-null-pointer-constant-3.C | 22 |
4 files changed, 34 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6833fc3..83a5508 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2011-11-24 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/51290 + * class.c (build_base_path): For the null pointer check use + nullptr_node instead of integer_zero_node. + 2011-11-22 Dodji Seketeli <dodji@redhat.com> PR c++/51145 diff --git a/gcc/cp/class.c b/gcc/cp/class.c index cb0e683..3cb76de 100644 --- a/gcc/cp/class.c +++ b/gcc/cp/class.c @@ -338,7 +338,7 @@ build_base_path (enum tree_code code, /* Now that we've saved expr, build the real null test. */ if (null_test) { - tree zero = cp_convert (TREE_TYPE (expr), integer_zero_node); + tree zero = cp_convert (TREE_TYPE (expr), nullptr_node); null_test = fold_build2_loc (input_location, NE_EXPR, boolean_type_node, expr, zero); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 4be809d..5674c28 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2011-11-24 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/51290 + * g++.dg/warn/Wzero-as-null-pointer-constant-3.C: New. + 2011-11-23 Jakub Jelinek <jakub@redhat.com> PR target/51261 diff --git a/gcc/testsuite/g++.dg/warn/Wzero-as-null-pointer-constant-3.C b/gcc/testsuite/g++.dg/warn/Wzero-as-null-pointer-constant-3.C new file mode 100644 index 0000000..ed54143 --- /dev/null +++ b/gcc/testsuite/g++.dg/warn/Wzero-as-null-pointer-constant-3.C @@ -0,0 +1,22 @@ +// PR c++/51290 +// { dg-options "-Wzero-as-null-pointer-constant" } + +class A { int a; }; + +class B { int b; }; + +class C : public A, public B +{ + private: + static void foo (A *x) + { + C *y = static_cast<C *>(x); + (void) y; + } + + static void bar (B *x) + { + C *y = static_cast<C *>(x); + (void) y; + } +}; |