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: r91646

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 2c0241fb3be539ac11574b724794daf74ea018ed..4793b244f823b3775be13bcf7cf4d4468c588281 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2004-12-02  Kazu Hirata  <kazu@cs.umass.edu>
+
+       * 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.

diff --git a/gcc/tree-cfg.c b/gcc/tree-cfg.c
index 93ce053f327fd3abeb67386bbfef6c12be59b4dd..8af27b9a94fff63a8d154b783d4bcbc75331e863 100644 (file)
--- a/gcc/tree-cfg.c
+++ b/gcc/tree-cfg.c
@@ -2264,19 +2264,17 @@ find_case_label_for_value (tree switch_expr, tree val)
 static bool
 phi_alternatives_equal (basic_block dest, edge e1, edge e2)
 {
-  tree phi, val1, val2;
-  int n1, n2;
+  int n1 = e1->dest_idx;
+  int n2 = e2->dest_idx;
+  tree phi;
 
   for (phi = phi_nodes (dest); phi; phi = PHI_CHAIN (phi))
     {
-      n1 = phi_arg_from_edge (phi, e1);
-      n2 = phi_arg_from_edge (phi, e2);
-
-      gcc_assert (n1 >= 0);
-      gcc_assert (n2 >= 0);
+      tree val1 = PHI_ARG_DEF (phi, n1);
+      tree val2 = PHI_ARG_DEF (phi, n2);
 
-      val1 = PHI_ARG_DEF (phi, n1);
-      val2 = PHI_ARG_DEF (phi, n2);
+      gcc_assert (val1 != NULL_TREE);
+      gcc_assert (val2 != NULL_TREE);
 
       if (!operand_equal_for_phi_arg_p (val1, val2))
        return false;