You should have received a copy of the GNU General Public License
along with GCC; see the file COPYING. If not, write to
-the Free Software Foundation, 59 Temple Place - Suite 330,
-Boston, MA 02111-1307, USA. */
+the Free Software Foundation, 51 Franklin Street, Fifth Floor,
+Boston, MA 02110-1301, USA. */
#include "config.h"
#include "system.h"
int len = EDGE_COUNT (bb->preds);
int cap = ideal_phi_node_len (len + 4);
- for (loc = &(bb_ann (bb)->phi_nodes);
+ for (loc = &(bb->phi_nodes);
*loc;
loc = &PHI_CHAIN (*loc))
{
/* Add the new PHI node to the list of PHI nodes for block BB. */
PHI_CHAIN (phi) = phi_nodes (bb);
- bb_ann (bb)->phi_nodes = phi;
+ bb->phi_nodes = phi;
/* Associate BB to the PHI node. */
set_bb_for_stmt (phi, bb);
}
SET_PHI_ARG_DEF (phi, e->dest_idx, def);
- PHI_ARG_NONZERO (phi, e->dest_idx) = false;
}
/* Remove the Ith argument from PHI's argument list. This routine
gcc_assert (i < num_elem);
- /* Delink the last item, which is being removed. */
- delink_imm_use (&(PHI_ARG_IMM_USE_NODE (phi, num_elem - 1)));
- /* If we are not at the last element, switch the last element
- with the element we want to delete. */
+ /* Delink the item which is being removed. */
+ delink_imm_use (&(PHI_ARG_IMM_USE_NODE (phi, i)));
+
+ /* If it is not the last element, move the last element
+ to the element we want to delete, resetting all the links. */
if (i != num_elem - 1)
{
- SET_PHI_ARG_DEF (phi, i, PHI_ARG_DEF (phi, num_elem - 1));
- PHI_ARG_NONZERO (phi, i) = PHI_ARG_NONZERO (phi, num_elem - 1);
+ use_operand_p old_p, new_p;
+ old_p = &PHI_ARG_IMM_USE_NODE (phi, num_elem - 1);
+ new_p = &PHI_ARG_IMM_USE_NODE (phi, i);
+ /* Set use on new node, and link into last element's place. */
+ *(new_p->use) = *(old_p->use);
+ relink_imm_use (new_p, old_p);
}
/* Shrink the vector and return. Note that we do not have to clear
- PHI_ARG_DEF or PHI_ARG_NONZERO because the garbage collector will
- not look at those elements beyond the first PHI_NUM_ARGS elements
- of the array. */
+ PHI_ARG_DEF because the garbage collector will not look at those
+ elements beyond the first PHI_NUM_ARGS elements of the array. */
PHI_NUM_ARGS (phi)--;
}
}
else
{
- for (loc = &(bb_ann (bb_for_stmt (phi))->phi_nodes);
+ for (loc = &(bb_for_stmt (phi)->phi_nodes);
*loc != phi;
loc = &PHI_CHAIN (*loc))
;