From bc2dce329b4625d7ea00ad7add6c2afeb04f89f6 Mon Sep 17 00:00:00 2001 From: Kazu Hirata Date: Tue, 2 Nov 2004 13:23:05 +0000 Subject: [PATCH] tree-phinodes.c (add_phi_arg): Add an assertion that the edge already exists. * tree-phinodes.c (add_phi_arg): Add an assertion that the edge already exists. From-SVN: r89985 --- gcc/ChangeLog | 5 +++++ gcc/tree-phinodes.c | 11 +++-------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 1e1662aeb39..60c224c1fba 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,8 @@ +2004-11-02 Kazu Hirata + + * tree-phinodes.c (add_phi_arg): Add an assertion that the + edge already exists. + 2004-11-02 Kazu Hirata * tree-phinodes.c (remove_phi_arg_num): Do not zero the diff --git a/gcc/tree-phinodes.c b/gcc/tree-phinodes.c index e7883e3951c..ba46c786459 100644 --- a/gcc/tree-phinodes.c +++ b/gcc/tree-phinodes.c @@ -295,12 +295,14 @@ create_phi_node (tree var, basic_block bb) void add_phi_arg (tree *phi, tree def, edge e) { + basic_block bb = e->dest; int i = PHI_NUM_ARGS (*phi); + gcc_assert (bb == bb_for_stmt (*phi)); + if (i >= PHI_ARG_CAPACITY (*phi)) { tree old_phi = *phi; - basic_block bb; /* Resize the phi. Unfortunately, this will relocate it. */ resize_phi_node (phi, ideal_phi_node_len (i + 4)); @@ -311,13 +313,6 @@ add_phi_arg (tree *phi, tree def, edge e) /* The result of the phi is defined by this phi node. */ SSA_NAME_DEF_STMT (PHI_RESULT (*phi)) = *phi; - /* Extract the basic block for the PHI from the PHI's annotation - rather than the edge. This works better as the edge's - 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. */