tree-cfg.c (phi_alternatives_equal): Check that PHI_ARG_DEF is not null.

* tree-cfg.c (phi_alternatives_equal): Check that PHI_ARG_DEF
	is not null.

From-SVN: r91647
This commit is contained in:
Kazu Hirata 2004-12-02 16:45:26 +00:00 committed by Kazu Hirata
parent 5dd8841aa1
commit d134295fc5
2 changed files with 8 additions and 4 deletions

View File

@ -3,6 +3,9 @@
* tree-cfg.c (phi_alternatives_equal): Check that PHI_ARG_DEF
is not null.
* tree-cfg.c (phi_alternatives_equal): Check that PHI_ARG_DEF
is not null.
2004-12-02 Jeff Law <law@redhat.com>
* tree-eh.c: Revert yesterday's change.

View File

@ -3941,7 +3941,6 @@ thread_jumps_from_bb (basic_block bb)
edge last, old;
basic_block dest, tmp, curr, old_dest;
tree phi;
int arg;
/* If the edge is abnormal or its destination is not
forwardable, then there's nothing to do. */
@ -4028,11 +4027,13 @@ thread_jumps_from_bb (basic_block bb)
have the same value as the argument associated with LAST.
Otherwise we would have changed our target block
above. */
int arg = last->dest_idx;
for (phi = phi_nodes (dest); phi; phi = PHI_CHAIN (phi))
{
arg = phi_arg_from_edge (phi, last);
gcc_assert (arg >= 0);
add_phi_arg (phi, PHI_ARG_DEF (phi, arg), e);
tree def = PHI_ARG_DEF (phi, arg);
gcc_assert (def != NULL_TREE);
add_phi_arg (phi, def, e);
}
}