diff options
| author | Jason Merrill <jason@redhat.com> | 2011-08-23 12:03:25 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2011-08-23 12:03:25 -0400 |
| commit | 27bec7bf4afb31eac4a79857ffe7aab3d9182e87 (patch) | |
| tree | ddbea6df18ac58a6503a69ef3d592547e2b3996a | |
| parent | 9b8662c2b04820f6024648ff863b83dbbf07844f (diff) | |
| download | gcc-27bec7bf4afb31eac4a79857ffe7aab3d9182e87.zip gcc-27bec7bf4afb31eac4a79857ffe7aab3d9182e87.tar.gz gcc-27bec7bf4afb31eac4a79857ffe7aab3d9182e87.tar.bz2 | |
Core 903 (partial)
Core 903 (partial)
* call.c (null_ptr_cst_p): Only 0 qualifies in C++11.
From-SVN: r177996
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/call.c | 14 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/constexpr-nullptr.C | 4 |
4 files changed, 16 insertions, 12 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 0f325a8..bbada45 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,10 @@ 2011-08-23 Jason Merrill <jason@redhat.com> + Core 903 (partial) + * call.c (null_ptr_cst_p): Only 0 qualifies in C++11. + +2011-08-23 Jason Merrill <jason@redhat.com> + Core 975 * decl.c (cxx_init_decl_processing): Initialize dependent_lambda_return_type_node. diff --git a/gcc/cp/call.c b/gcc/cp/call.c index d2700cb..e5f65b3 100644 --- a/gcc/cp/call.c +++ b/gcc/cp/call.c @@ -541,20 +541,14 @@ null_ptr_cst_p (tree t) return true; if (CP_INTEGRAL_TYPE_P (TREE_TYPE (t))) { - if (cxx_dialect >= cxx0x) - { - t = fold_non_dependent_expr (t); - t = maybe_constant_value (t); - if (TREE_CONSTANT (t) && integer_zerop (t)) - return true; - } - else + /* Core issue 903 says only literal 0 is a null pointer constant. */ + if (cxx_dialect < cxx0x) { t = integral_constant_value (t); STRIP_NOPS (t); - if (integer_zerop (t) && !TREE_OVERFLOW (t)) - return true; } + if (integer_zerop (t) && !TREE_OVERFLOW (t)) + return true; } return false; } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 9dfa4d3..a85caca 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2011-08-23 Jason Merrill <jason@redhat.com> + Core 903 + * g++.dg/cpp0x/constexpr-nullptr.C: Now ill-formed. + +2011-08-23 Jason Merrill <jason@redhat.com> + Core 975 * g++.dg/cpp0x/lambda/lambda-deduce-ext-neg2.C: Now accepted. * g++.dg/cpp0x/lambda/lambda-deduce-ext-neg.C: Adjust. diff --git a/gcc/testsuite/g++.dg/cpp0x/constexpr-nullptr.C b/gcc/testsuite/g++.dg/cpp0x/constexpr-nullptr.C index 7ac53db..6381323 100644 --- a/gcc/testsuite/g++.dg/cpp0x/constexpr-nullptr.C +++ b/gcc/testsuite/g++.dg/cpp0x/constexpr-nullptr.C @@ -2,5 +2,5 @@ constexpr int zero() { return 0; } -void* ptr1 = zero(); // #1 -constexpr void* ptr2 = zero(); // #2 +void* ptr1 = zero(); // { dg-error "int" } +constexpr void* ptr2 = zero(); // { dg-error "int" } |