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

re PR c++/49165 (ICE on for-loop/throw combination)

Browse source 
PR c++/49165
	* gimplify.c (shortcut_cond_r): Don't special case
	COND_EXPRs if they have void type on one of their arms.

	* g++.dg/eh/cond5.C: New test.

From-SVN: r174273
This commit is contained in:
Jakub Jelinek 2011-05-26 12:25:21 +02:00 • committed by Jakub Jelinek
parent 7b1ac803d3
commit 1537737f28
4 changed files with 59 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/ChangeLog
View file

@ -1,3 +1,9 @@
2011-05-26 Jakub Jelinek <jakub@redhat.com>
PR c++/49165
* gimplify.c (shortcut_cond_r): Don't special case
COND_EXPRs if they have void type on one of their arms.
2011-05-26 Bernd Schmidt <bernds@codesourcery.com>
* haifa-sched.c (schedule-block): Reorder the inner scheduling loop

9
gcc/gimplify.c
View file

@ -2573,7 +2573,9 @@ shortcut_cond_r (tree pred, tree *true_label_p, tree *false_label_p,
new_locus);
append_to_statement_list (t, &expr);
}
else if (TREE_CODE (pred) == COND_EXPR)
else if (TREE_CODE (pred) == COND_EXPR
&& !VOID_TYPE_P (TREE_TYPE (TREE_OPERAND (pred, 1)))
&& !VOID_TYPE_P (TREE_TYPE (TREE_OPERAND (pred, 2))))
{
location_t new_locus;
@ -2581,7 +2583,10 @@ shortcut_cond_r (tree pred, tree *true_label_p, tree *false_label_p,
if (a)
if (b) goto yes; else goto no;
else
if (c) goto yes; else goto no; */
if (c) goto yes; else goto no;
Don't do this if one of the arms has void type, which can happen
in C++ when the arm is throw. */
/* Keep the original source location on the first 'if'. Set the source
location of the ? on the second 'if'. */

3
gcc/testsuite/ChangeLog
View file

@ -1,5 +1,8 @@
2011-05-26 Jakub Jelinek <jakub@redhat.com>
PR c++/49165
* g++.dg/eh/cond5.C: New test.
PR tree-optimization/49161
* gcc.c-torture/execute/pr49161.c: New test.

43
gcc/testsuite/g++.dg/eh/cond5.C Normal file
View file

@ -0,0 +1,43 @@
// PR c++/49165
// { dg-do run }
extern "C" void abort ();
int
foo (bool x, int y)
{
if (y < 10 && (x ? true : throw 1))
y++;
if (y > 20 || (x ? true : throw 2))
y++;
return y;
}
int
main ()
{
if (foo (true, 0) != 2
|| foo (true, 10) != 11
|| foo (false, 30) != 31)
abort ();
try
{
foo (false, 0);
abort ();
}
catch (int i)
{
if (i != 1)
abort ();
}
try
{
foo (false, 10);
abort ();
}
catch (int i)
{
if (i != 2)
abort ();
}
}