diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2012-12-03 16:01:32 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2012-12-03 16:01:32 +0000 |
| commit | e3692e025bfb3c96c2ad4dd681edb112ae401c77 (patch) | |
| tree | f3c2cf1fcde324c919db79a3999d4b007571d58f /gcc | |
| parent | cc1f4a3020b278ab31c8c77feb7375719e88f013 (diff) | |
| download | gcc-e3692e025bfb3c96c2ad4dd681edb112ae401c77.zip gcc-e3692e025bfb3c96c2ad4dd681edb112ae401c77.tar.gz gcc-e3692e025bfb3c96c2ad4dd681edb112ae401c77.tar.bz2 | |
re PR c++/54170 (Call to lambda elided)
/cp
2012-12-03 Paolo Carlini <paolo.carlini@oracle.com>
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 <paolo.carlini@oracle.com>
PR c++/54170
* g++.dg/cpp0x/lambda/lambda-nullptr.C: New.
From-SVN: r194098
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/cp/cvt.c | 18 | ||||
| -rw-r--r-- | gcc/cp/typeck.c | 2 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nullptr.C | 47 |
5 files changed, 68 insertions, 11 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b419f64..220b156 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,10 @@ +2012-12-03 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/54170 + * cvt.c (cp_convert_to_pointer): Don't discard side-effects from + expressions of nullptr_t. + * typeck.c (build_ptrmemfunc): Likewise. + 2012-12-01 Jakub Jelinek <jakub@redhat.com> PR c++/55542 diff --git a/gcc/cp/cvt.c b/gcc/cp/cvt.c index 4ba7642..7731b4a 100644 --- a/gcc/cp/cvt.c +++ b/gcc/cp/cvt.c @@ -215,16 +215,14 @@ cp_convert_to_pointer (tree type, tree expr, tsubst_flags_t complain) return build_ptrmemfunc (TYPE_PTRMEMFUNC_FN_TYPE (type), expr, 0, /*c_cast_p=*/false, complain); - if (TYPE_PTRDATAMEM_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); - - return expr; + /* A NULL pointer-to-data-member is represented by -1, not by + zero. */ + tree val = (TYPE_PTRDATAMEM_P (type) + ? build_int_cst_type (type, -1) + : build_int_cst (type, 0)); + + return (TREE_SIDE_EFFECTS (expr) + ? build2 (COMPOUND_EXPR, type, expr, val) : val); } else if (TYPE_PTRMEM_P (type) && INTEGRAL_CODE_P (form)) { diff --git a/gcc/cp/typeck.c b/gcc/cp/typeck.c index 1cbab61..ef76dcd 100644 --- a/gcc/cp/typeck.c +++ b/gcc/cp/typeck.c @@ -7567,7 +7567,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 550d459..89e7a79 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2012-12-03 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/54170 + * g++.dg/cpp0x/lambda/lambda-nullptr.C: New. + 2012-12-03 Jakub Jelinek <jakub@redhat.com> PR testsuite/55452 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 0000000..1aadbb4 --- /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 <cassert> + +struct A; +typedef A* ptr; +typedef int (A::*pmf) (int); +typedef int (A::*pdm); + +int total; + +void add(int n) +{ + total += n; +} + +template <typename RType, typename Callable> +RType Call(Callable native_func, int arg) +{ + return native_func(arg); +} + +template <typename RType> +RType do_test(int delta) +{ + return Call<RType>([=](int delta) { add(delta); return nullptr; }, delta); +} + +template <typename RType> +void test() +{ + total = 0; + assert (!do_test<RType>(5)); + assert (total == 5); + assert (!do_test<RType>(20)); + assert (total == 25); + assert (!do_test<RType>(-256)); + assert (total == -231); +} + +int main() +{ + test<ptr>(); + test<pdm>(); + test<pmf>(); +} |