diff options
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/nullptr28.C | 16 |
4 files changed, 28 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index fbaca51..2d321b0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2012-06-25 Jason Merrill <jason@redhat.com> + + PR c++/52988 + * typeck.c (decay_conversion): Don't discard side-effects from + expressions of nullptr_t. + 2012-06-25 Florian Weimer <fweimer@redhat.com> * init.c (build_new_1): Warn about (T[N]) for variable N, and diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 945266b..971f386 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -1843,7 +1843,7 @@ decay_conversion (tree exp, tsubst_flags_t complain) if (error_operand_p (exp)) return error_mark_node; - if (NULLPTR_TYPE_P (type)) + if (NULLPTR_TYPE_P (type) && !TREE_SIDE_EFFECTS (exp)) return nullptr_node; /* build_c_cast puts on a NOP_EXPR to make the result not an lvalue. diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 30b83d5..0323f99 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-06-25 Jason Merrill <jason@redhat.com> + + PR c++/52988 + * g++.dg/cpp0x/nullptr28.C: New. + 2012-06-25 Christophe Lyon <christophe.lyon@st.com> * gcc.target/arm/neon-vld1_dupQ.c: New. diff --git a/gcc/testsuite/g++.dg/cpp0x/nullptr28.C b/gcc/testsuite/g++.dg/cpp0x/nullptr28.C new file mode 100644 index 0000000..05fbe57 --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/nullptr28.C @@ -0,0 +1,16 @@ +// { dg-do run { target c++11 } } + +typedef decltype(nullptr) nullptr_t; + +int i; +nullptr_t n; +const nullptr_t& f() { ++i; return n; } + +nullptr_t g() { return f(); } + +int main() +{ + g(); + if (i != 1) + __builtin_abort (); +} |