mirror/gcc
2
0
Fork 0
mirror of git://gcc.gnu.org/git/gcc.git synced 2025-04-06 02:10:29 +08:00
Code Issues Packages Projects Releases Wiki Activity

re PR tree-optimization/45709 (internal compiler error: in add_phi_arg, at tree-phinodes.c:395)

Browse Source 
2010-09-18  Richard Guenther  <rguenther@suse.de>

	PR tree-optimization/45709
	* tree-inline.c (copy_phis_for_bb): Delay commit of edge
	insertions until after all PHI nodes of the block are processed.

	* g++.dg/torture/pr45709-2.C: New testcase.

From-SVN: r164397
This commit is contained in:
Richard Guenther 2010-09-18 17:13:04 +00:00 committed by Richard Biener
parent f52a39cde6
commit 6a78fd06c5
4 changed files with 45 additions and 5 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-09-18 Richard Guenther <rguenther@suse.de>
PR tree-optimization/45709
* tree-inline.c (copy_phis_for_bb): Delay commit of edge
insertions until after all PHI nodes of the block are processed.
2010-09-18 Tijl Coosemans <tijl@coosemans.org>
* config/i386/freebsd.h (SUBTARGET32_DEFAULT_CPU): Add.

10
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,13 @@
2010-09-18 Richard Guenther <rguenther@suse.de>
PR tree-optimization/45709
* g++.dg/torture/pr45709-2.C: New testcase.
2010-09-18 Richard Guenther <rguenther@suse.de>
PR tree-optimization/45709
* g++.dg/torture/pr45709.C: New testcase.
2010-09-18 H.J. Lu <hongjiu.lu@intel.com>
PR testsuite/45719

20
gcc/testsuite/g++.dg/torture/pr45709-2.C Normal file
View File

@ -0,0 +1,20 @@
// { dg-do compile }
struct Region {
int storage[4];
int count;
};
static inline Region subtract(int lhs)
{
Region reg;
int* storage = reg.storage;
int* storage2 = reg.storage;
if (lhs > 0)
storage++, storage2--;
reg.count = storage - reg.storage + storage2 - reg.storage;
return reg;
}
void bar(int a)
{
const Region copyBack(subtract(a));
}

14
gcc/tree-inline.c
View File

@ -1977,12 +1977,13 @@ copy_phis_for_bb (basic_block bb, copy_body_data *id)
edge_iterator ei;
gimple phi;
gimple_stmt_iterator si;
edge new_edge;
bool inserted = false;
for (si = gsi_start (phi_nodes (bb)); !gsi_end_p (si); gsi_next (&si))
{
tree res, new_res;
gimple new_phi;
edge new_edge;
phi = gsi_stmt (si);
res = PHI_RESULT (phi);
@ -2021,17 +2022,20 @@ copy_phis_for_bb (basic_block bb, copy_body_data *id)
&& !is_gimple_val (new_arg))
{
gimple_seq stmts = NULL;
basic_block tem;
new_arg = force_gimple_operand (new_arg, &stmts, true, NULL);
tem = gsi_insert_seq_on_edge_immediate (new_edge, stmts);
if (tem)
new_edge = single_succ_edge (tem);
gsi_insert_seq_on_edge (new_edge, stmts);
inserted = true;
}
add_phi_arg (new_phi, new_arg, new_edge,
gimple_phi_arg_location_from_edge (phi, old_edge));
}
}
}
/* Commit the delayed edge insertions. */
if (inserted)
FOR_EACH_EDGE (new_edge, ei, new_bb->preds)
gsi_commit_one_edge_insert (new_edge, NULL);
}