git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

re PR tree-optimization/43367 (ice: in may_propagate_copy, at tree-ssa-copy.c:85) 

2010-03-15  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/43367
	* tree-cfg.c (gimple_can_merge_blocks_p): Simplify PHI
	elimination check.

	* gcc.c-torture/compile/pr43367.c: New testcase.

From-SVN: r157458
This commit is contained in:
Richard Guenther 2010-03-15 13:18:45 +00:00 committed by Richard Biener
parent 610de68dbe
commit 610b64e2a2
4 changed files with 46 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
gcc/ChangeLog
View File

@ -1,3 +1,9 @@
2010-03-15 Richard Guenther <rguenther@suse.de>
PR tree-optimization/43367
* tree-cfg.c (gimple_can_merge_blocks_p): Simplify PHI
elimination check.
2010-03-15 Richard Guenther <rguenther@suse.de>
PR tree-optimization/43317

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2010-03-15 Richard Guenther <rguenther@suse.de>
PR tree-optimization/43367
* gcc.c-torture/compile/pr43367.c: New testcase.
2010-03-15 Richard Guenther <rguenther@suse.de>
PR tree-optimization/43317

30
gcc/testsuite/gcc.c-torture/compile/pr43367.c Normal file
View File

@ -0,0 +1,30 @@
unsigned char g_17;
const unsigned char func_39 (unsigned char p_40, unsigned char * p_41)
{
return 0;
}
void int327 (const unsigned char p_48, unsigned char p_49)
{
unsigned l_52;
unsigned char l_58[2];
int i, j;
if (func_39 (l_52, &p_49), p_48) {
unsigned char *l_60;
unsigned char *l = &l_58[1];
for (j; j; j++) {
lbl_59:
break;
}
for (l = 0; 1; l += 1) {
for (p_49 = 1; p_49; p_49 += 0) {
unsigned char **l_61[1][6];
for (j = 0; j < 1; j++)
l_61[i][j] = &l_60;
goto lbl_59;
}
}
}
}

25
gcc/tree-cfg.c
View File

@ -1438,27 +1438,12 @@ gimple_can_merge_blocks_p (basic_block a, basic_block b)
return false;
/* It must be possible to eliminate all phi nodes in B. If ssa form
is not up-to-date, we cannot eliminate any phis; however, if only
some symbols as whole are marked for renaming, this is not a problem,
as phi nodes for those symbols are irrelevant in updating anyway. */
is not up-to-date and a name-mapping is registered, we cannot eliminate
any phis. Symbols marked for renaming are never a problem though. */
phis = phi_nodes (b);
if (!gimple_seq_empty_p (phis))
{
gimple_stmt_iterator i;
if (name_mappings_registered_p ())
return false;
for (i = gsi_start (phis); !gsi_end_p (i); gsi_next (&i))
{
gimple phi = gsi_stmt (i);
if (!is_gimple_reg (gimple_phi_result (phi))
&& !may_propagate_copy (gimple_phi_result (phi),
gimple_phi_arg_def (phi, 0)))
return false;
}
}
if (!gimple_seq_empty_p (phis)
&& name_mappings_registered_p ())
return false;
return true;
}