tree-flow-inline.h (op_iter_init): Reject GIMPLE_PHI stmts.

* tree-flow-inline.h (op_iter_init): Reject GIMPLE_PHI stmts.
(num_ssa_operands): Likewise.
(op_iter_init_phiuse): Forward-declare.
(delink_stmt_imm_use): Iterate with FOR_EACH_PHI_OR_STMT_USE.

From-SVN: r174815

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index fe061baeffd22057dd77489bdab76d8fbb1f1f9a..297fc790d04bbaa5316ca88e7e4541045f8d8c82 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2011-06-08  Alexandre Oliva  <aoliva@redhat.com>
+
+       * tree-flow-inline.h (op_iter_init): Reject GIMPLE_PHI stmts.
+       (num_ssa_operands): Likewise.
+       (op_iter_init_phiuse): Forward-declare.
+       (delink_stmt_imm_use): Iterate with FOR_EACH_PHI_OR_STMT_USE.
+
 2011-06-08  Nick Clifton  <nickc@redhat.com>
 
        * doc/invoke.texi (ARM Options): Update description of

diff --git a/gcc/tree-flow-inline.h b/gcc/tree-flow-inline.h
index dcbe355e926220af8c6c517653c01aa7996c86a0..b9c5e16e972c8d28924464c69e77c23fe96f5b89 100644 (file)
--- a/gcc/tree-flow-inline.h
+++ b/gcc/tree-flow-inline.h
@@ -737,9 +737,11 @@ clear_and_done_ssa_iter (ssa_op_iter *ptr)
 static inline void
 op_iter_init (ssa_op_iter *ptr, gimple stmt, int flags)
 {
-  /* We do not support iterating over virtual defs or uses without
+  /* PHI nodes require a different iterator initialization path.  We
+     do not support iterating over virtual defs or uses without
      iterating over defs or uses at the same time.  */
-  gcc_checking_assert ((!(flags & SSA_OP_VDEF) || (flags & SSA_OP_DEF))
+  gcc_checking_assert (gimple_code (stmt) != GIMPLE_PHI
+                      && (!(flags & SSA_OP_VDEF) || (flags & SSA_OP_DEF))
                       && (!(flags & SSA_OP_VUSE) || (flags & SSA_OP_USE)));
   ptr->defs = (flags & (SSA_OP_DEF|SSA_OP_VDEF)) ? gimple_def_ops (stmt) : NULL;
   if (!(flags & SSA_OP_VDEF)
@@ -868,11 +870,14 @@ num_ssa_operands (gimple stmt, int flags)
   tree t;
   int num = 0;
 
+  gcc_checking_assert (gimple_code (stmt) != GIMPLE_PHI);
   FOR_EACH_SSA_TREE_OPERAND (t, stmt, iter, flags)
     num++;
   return num;
 }
 
+static inline use_operand_p
+op_iter_init_phiuse (ssa_op_iter *ptr, gimple phi, int flags);
 
 /* Delink all immediate_use information for STMT.  */
 static inline void
@@ -882,7 +887,7 @@ delink_stmt_imm_use (gimple stmt)
    use_operand_p use_p;
 
    if (ssa_operands_active ())
-     FOR_EACH_SSA_USE_OPERAND (use_p, stmt, iter, SSA_OP_ALL_USES)
+     FOR_EACH_PHI_OR_STMT_USE (use_p, stmt, iter, SSA_OP_ALL_USES)
        delink_imm_use (use_p);
 }