re PR c++/69211 (g++ ICE on x86_64-linux-gnu (verify_gimple failed))

PR c++/69211
	* cp-gimplify.c (cp_fold): If COMPOUND_EXPR or MODIFY_EXPR
	folded operands have side-effects, but folding changed any of them,
	build a new tree with the folded operands instead of returning the
	unfolded tree.

	* g++.dg/opt/pr69211.C: New test.

From-SVN: r232237
This commit is contained in:
Jakub Jelinek 2016-01-11 18:59:22 +01:00 committed by Jakub Jelinek
parent 5a32af0ec5
commit 9cb6bd7432
4 changed files with 26 additions and 1 deletions

View File

@ -1,3 +1,11 @@
2016-01-11 Jakub Jelinek <jakub@redhat.com>
PR c++/69211
* cp-gimplify.c (cp_fold): If COMPOUND_EXPR or MODIFY_EXPR
folded operands have side-effects, but folding changed any of them,
build a new tree with the folded operands instead of returning the
unfolded tree.
2016-01-09 Marek Polacek <polacek@redhat.com>
PR c++/69113

View File

@ -2086,7 +2086,11 @@ cp_fold (tree x)
if ((code == COMPOUND_EXPR || code == MODIFY_EXPR)
&& ((op1 && TREE_SIDE_EFFECTS (op1))
|| (op0 && TREE_SIDE_EFFECTS (op0))))
break;
{
if (op0 != TREE_OPERAND (x, 0) || op1 != TREE_OPERAND (x, 1))
x = build2_loc (loc, code, TREE_TYPE (x), op0, op1);
break;
}
if (TREE_CODE (x) == COMPOUND_EXPR && !op0)
op0 = build_empty_stmt (loc);

View File

@ -1,5 +1,8 @@
2016-01-11 Jakub Jelinek <jakub@redhat.com>
PR c++/69211
* g++.dg/opt/pr69211.C: New test.
PR tree-optimization/69214
* gcc.c-torture/compile/pr69214.c: New test.

View File

@ -0,0 +1,10 @@
// PR c++/69211
// { dg-do compile }
int a, b;
int
foo ()
{
return (a & 5UL | (b = 4, 4L)) > 4;
}