OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

re PR c++/54170 (Call to lambda elided)

Browse Source 
/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
This commit is contained in:
Paolo Carlini 2012-12-03 16:01:32 +00:00 committed by Paolo Carlini
parent cc1f4a3020
commit e3692e025b
5 changed files with 67 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/cp/ChangeLog
View File

@ -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

16
gcc/cp/cvt.c
View File

@ -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);
/* 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 expr;
return (TREE_SIDE_EFFECTS (expr)
? build2 (COMPOUND_EXPR, type, expr, val) : val);
}
else if (TYPE_PTRMEM_P (type) && INTEGRAL_CODE_P (form))
{

2
gcc/cp/typeck.c
View File

@ -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);

5
gcc/testsuite/ChangeLog
View File

@ -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

47
gcc/testsuite/g++.dg/cpp0x/lambda/lambda-nullptr.C Normal file
View File

@ -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>();
}