From f6911989a52516fa176a1630b571556bc8c07e0b Mon Sep 17 00:00:00 2001 From: jason Date: Wed, 10 Jul 2013 05:53:45 +0000 Subject: [PATCH] /cp 2012-12-03 Paolo Carlini PR c++/54170 * cvt.c (cp_convert_to_pointer): Don't discard side-effects from expressions of nullptr_t. * typeck.c (build_ptrmemfunc): Likewise. /testsuite 2012-12-03 Paolo Carlini PR c++/54170 * g++.dg/cpp0x/lambda/lambda-nullptr.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/branches/gcc-4_7-branch@200863 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 7 ++++ gcc/cp/cvt.c | 18 ++++----- gcc/cp/typeck.c | 2 +- gcc/testsuite/ChangeLog | 5 +++ gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nullptr.C | 47 ++++++++++++++++++++++ 5 files changed, 69 insertions(+), 10 deletions(-) create mode 100644 gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nullptr.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b0e6133b9f7..5b5acd93069 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2012-12-03 Paolo Carlini + + PR c++/54170 + * cvt.c (cp_convert_to_pointer): Don't discard side-effects from + expressions of nullptr_t. + * typeck.c (build_ptrmemfunc): Likewise. + 2013-07-09 Jason Merrill PR c++/57437 diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index c411a47f0a8..d7ad05b1583 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -198,6 +198,8 @@ cp_convert_to_pointer (tree type, tree expr) if (null_ptr_cst_p (expr)) { + tree val; + if (c_inhibit_evaluation_warnings == 0 && !NULLPTR_TYPE_P (TREE_TYPE (expr))) warning (OPT_Wzero_as_null_pointer_constant, @@ -207,16 +209,14 @@ cp_convert_to_pointer (tree type, tree expr) return build_ptrmemfunc (TYPE_PTRMEMFUNC_FN_TYPE (type), expr, 0, /*c_cast_p=*/false, tf_warning_or_error); - if (TYPE_PTRMEM_P (type)) - { - /* A NULL pointer-to-member is represented by -1, not by - zero. */ - expr = build_int_cst_type (type, -1); - } - else - expr = build_int_cst (type, 0); + /* A NULL pointer-to-data-member is represented by -1, not by + zero. */ + val = (TYPE_PTRMEM_P (type) + ? build_int_cst_type (type, -1) + : build_int_cst (type, 0)); - return expr; + return (TREE_SIDE_EFFECTS (expr) + ? build2 (COMPOUND_EXPR, type, expr, val) : val); } else if (TYPE_PTR_TO_MEMBER_P (type) && INTEGRAL_CODE_P (form)) { diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 796eea6465c..688946ab7c7 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -7246,7 +7246,7 @@ build_ptrmemfunc (tree type, tree pfn, int force, bool c_cast_p, /* Handle null pointer to member function conversions. */ if (null_ptr_cst_p (pfn)) { - pfn = build_c_cast (input_location, type, nullptr_node); + pfn = build_c_cast (input_location, type, pfn); return build_ptrmemfunc1 (to_type, integer_zero_node, pfn); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 10df7f3331b..1f7cfff2fcd 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-12-03 Paolo Carlini + + PR c++/54170 + * g++.dg/cpp0x/lambda/lambda-nullptr.C: New. + 2013-07-08 Tobias Burnus PR fortran/57785 diff --git a/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nullptr.C b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nullptr.C new file mode 100644 index 00000000000..8a4d028291f --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nullptr.C @@ -0,0 +1,47 @@ +// PR c++/54170 +// { dg-do run { target c++11 } } + +#include + +struct A; +typedef A* ptr; +typedef int (A::*pmf) (int); +typedef int (A::*pdm); + +int total; + +void add(int n) +{ + total += n; +} + +template +RType Call(Callable native_func, int arg) +{ + return native_func(arg); +} + +template +RType do_test(int delta) +{ + return Call([=](int delta) { add(delta); return nullptr; }, delta); +} + +template +void test() +{ + total = 0; + assert (!do_test(5)); + assert (total == 5); + assert (!do_test(20)); + assert (total == 25); + assert (!do_test(-256)); + assert (total == -231); +} + +int main() +{ + test(); + test(); + test(); +} -- 2.11.0