OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

tree-phinodes.c (add_phi_arg): Turn an "if" that always triggers into gcc_assert.

Browse Source 
* tree-phinodes.c (add_phi_arg): Turn an "if" that always
	triggers into gcc_assert.

From-SVN: r89800
This commit is contained in:
Kazu Hirata 2004-10-29 00:48:00 +00:00 committed by Kazu Hirata
parent 1a8dfc45ba
commit 0f84c36ef4
2 changed files with 31 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/ChangeLog
View File

@ -1,3 +1,8 @@
2004-10-29 Kazu Hirata <kazu@cs.umass.edu>
* tree-phinodes.c (add_phi_arg): Turn an "if" that always
triggers into gcc_assert.
2004-10-28 Diego Novillo <dnovillo@redhat.com> 2004-10-28 Diego Novillo <dnovillo@redhat.com>
PR tree-optimization/16728 PR tree-optimization/16728

53
gcc/tree-phinodes.c
View File

@ -321,42 +321,41 @@ add_phi_arg (tree *phi, tree def, edge e)
if (i >= PHI_ARG_CAPACITY (*phi)) if (i >= PHI_ARG_CAPACITY (*phi))
{ {
tree old_phi = *phi; tree old_phi = *phi;
basic_block bb;
/* Resize the phi. Unfortunately, this may also relocate it. */ /* Resize the phi. Unfortunately, this will relocate it. */
resize_phi_node (phi, ideal_phi_node_len (i + 4)); resize_phi_node (phi, ideal_phi_node_len (i + 4));
/* resize_phi_node will necessarily relocate the phi. */
gcc_assert (*phi != old_phi);
/* The result of the phi is defined by this phi node. */ /* The result of the phi is defined by this phi node. */
SSA_NAME_DEF_STMT (PHI_RESULT (*phi)) = *phi; SSA_NAME_DEF_STMT (PHI_RESULT (*phi)) = *phi;
/* If the PHI was relocated, update the PHI chains appropriately and /* Extract the basic block for the PHI from the PHI's annotation
release the old PHI node. */ rather than the edge. This works better as the edge's
if (*phi != old_phi) destination may not currently be the block with the PHI node
if we are in the process of threading the edge to a new
destination. */
bb = bb_for_stmt (*phi);
release_phi_node (old_phi);
/* Update the list head if replacing the first listed phi. */
if (phi_nodes (bb) == old_phi)
bb_ann (bb)->phi_nodes = *phi;
else
{ {
/* Extract the basic block for the PHI from the PHI's annotation /* Traverse the list looking for the phi node to chain to. */
rather than the edge. This works better as the edge's tree p;
destination may not currently be the block with the PHI
node if we are in the process of threading the edge to
a new destination. */
basic_block bb = bb_for_stmt (*phi);
release_phi_node (old_phi); for (p = phi_nodes (bb);
p && PHI_CHAIN (p) != old_phi;
p = PHI_CHAIN (p))
;
/* Update the list head if replacing the first listed phi. */ gcc_assert (p);
if (phi_nodes (bb) == old_phi) PHI_CHAIN (p) = *phi;
bb_ann (bb)->phi_nodes = *phi;
else
{
/* Traverse the list looking for the phi node to chain to. */
tree p;
for (p = phi_nodes (bb);
p && PHI_CHAIN (p) != old_phi;
p = PHI_CHAIN (p))
;
gcc_assert (p);
PHI_CHAIN (p) = *phi;
}
} }
} }