re PR c++/92992 (Side-effects dropped when decltype(nullptr) typed expression is passed to ellipsis)

PR c++/92992
	* call.c (convert_arg_to_ellipsis): For decltype(nullptr) arguments
	that have side-effects use cp_build_compound_expr.

	* g++.dg/cpp0x/nullptr45.C: New test.
This commit is contained in:
Jakub Jelinek 2020-01-22 17:39:55 +01:00
parent a11e92c4e7
commit beee53d59e
4 changed files with 47 additions and 1 deletions

View File

@ -1,3 +1,12 @@
2020-01-22 Jakub Jelinek <jakub@redhat.com>
Backported from mainline
2019-12-20 Jakub Jelinek <jakub@redhat.com>
PR c++/92992
* call.c (convert_arg_to_ellipsis): For decltype(nullptr) arguments
that have side-effects use cp_build_compound_expr.
2020-01-21 Jason Merrill <jason@redhat.com>
PR c++/91476 - anon-namespace reference temp clash between TUs.

View File

@ -7543,7 +7543,12 @@ convert_arg_to_ellipsis (tree arg, tsubst_flags_t complain)
arg = convert_to_real_nofold (double_type_node, arg);
}
else if (NULLPTR_TYPE_P (arg_type))
arg = null_pointer_node;
{
if (TREE_SIDE_EFFECTS (arg))
arg = cp_build_compound_expr (arg, null_pointer_node, complain);
else
arg = null_pointer_node;
}
else if (INTEGRAL_OR_ENUMERATION_TYPE_P (arg_type))
{
if (SCOPED_ENUM_P (arg_type))

View File

@ -1,3 +1,11 @@
2020-01-22 Jakub Jelinek <jakub@redhat.com>
Backported from mainline
2019-12-20 Jakub Jelinek <jakub@redhat.com>
PR c++/92992
* g++.dg/cpp0x/nullptr45.C: New test.
2020-01-22 Joseph Myers <joseph@codesourcery.com>
Backport from mainline:

View File

@ -0,0 +1,24 @@
// PR c++/92992
// { dg-do run { target c++11 } }
int a;
void
bar (int, ...)
{
}
decltype (nullptr)
baz ()
{
a++;
return nullptr;
}
int
main ()
{
bar (0, baz ());
if (a != 1)
__builtin_abort ();
}