FreeChainXenon/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

re PR c++/84449 (ICE with constexpr and deleted destructor)

Browse source 
PR c++/84449
	* tree.c (bot_manip): If build_cplus_new or break_out_target_exprs
	returns error_mark_node, return it immediately.
	(break_out_target_exprs): If cp_walk_tree with bot_manip returns
	error_mark_node, return error_mark_node.

	* g++.dg/cpp0x/constexpr-84449.C: New test.

From-SVN: r257839
This commit is contained in:
Jakub Jelinek 2018-02-20 09:21:36 +01:00 • committed by Jakub Jelinek
parent dda0944cd5
commit 7f5753d715
4 changed files with 29 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,5 +1,11 @@
2018-02-20 Jakub Jelinek <jakub@redhat.com>
PR c++/84449
* tree.c (bot_manip): If build_cplus_new or break_out_target_exprs
returns error_mark_node, return it immediately.
(break_out_target_exprs): If cp_walk_tree with bot_manip returns
error_mark_node, return error_mark_node.
PR c++/84455
* pt.c (tsubst_lambda_expr): If not nested, increment temporarily
function_depth to avoid GC during finish_lambda_function.

7
gcc/cp/tree.c
View file

@ -2896,6 +2896,8 @@ bot_manip (tree* tp, int* walk_subtrees, void* data)
{
u = build_cplus_new (TREE_TYPE (t), TREE_OPERAND (t, 1),
tf_warning_or_error);
if (u == error_mark_node)
return u;
if (AGGR_INIT_ZERO_FIRST (TREE_OPERAND (t, 1)))
AGGR_INIT_ZERO_FIRST (TREE_OPERAND (u, 1)) = true;
}
@ -2913,6 +2915,8 @@ bot_manip (tree* tp, int* walk_subtrees, void* data)
(splay_tree_value) TREE_OPERAND (u, 0));
TREE_OPERAND (u, 1) = break_out_target_exprs (TREE_OPERAND (u, 1));
if (TREE_OPERAND (u, 1) == error_mark_node)
return error_mark_node;
/* Replace the old expression with the new version. */
*tp = u;
@ -3025,7 +3029,8 @@ break_out_target_exprs (tree t)
target_remap = splay_tree_new (splay_tree_compare_pointers,
/*splay_tree_delete_key_fn=*/NULL,
/*splay_tree_delete_value_fn=*/NULL);
cp_walk_tree (&t, bot_manip, target_remap, NULL);
if (cp_walk_tree (&t, bot_manip, target_remap, NULL) == error_mark_node)
t = error_mark_node;
cp_walk_tree (&t, bot_replace, target_remap, NULL);
if (!--target_remap_count)

3
gcc/testsuite/ChangeLog
View file

@ -1,5 +1,8 @@
2018-02-20 Jakub Jelinek <jakub@redhat.com>
PR c++/84449
* g++.dg/cpp0x/constexpr-84449.C: New test.
PR c++/84455
* g++.dg/cpp0x/lambda/lambda-ice26.C: New test.

14
gcc/testsuite/g++.dg/cpp0x/constexpr-84449.C Normal file
View file

@ -0,0 +1,14 @@
// PR c++/84449
// { dg-do compile { target c++11 } }
struct A
{
constexpr A (int) {}
~A () = delete;
};
struct B
{
A a;
constexpr B () : a (0) {} // { dg-error "use of deleted function" }
};