* c-tree.h (C_DECL_USED, parser_obstack, in_alignof, in_sizeof,

[pf3gnuchains/gcc-fork.git] / gcc / tree-ssa-live.c

diff --git a/gcc/tree-ssa-live.c b/gcc/tree-ssa-live.c
index 95b1834..014ec2d 100644 (file)
--- a/gcc/tree-ssa-live.c
+++ b/gcc/tree-ssa-live.c
@@ -135,8 +135,7 @@ var_union (var_map map, tree var1, tree var2)
 
       /* If there is no root_var set, or its not a user variable, set the
         root_var to this one.  */
-      if (!root_var
-          || (TREE_CODE (root_var) == VAR_DECL && DECL_ARTIFICIAL (root_var)))
+      if (!root_var || (DECL_P (root_var) && DECL_IGNORED_P (root_var)))
         {
          other_var = root_var;
          root_var = var2;
@@ -326,16 +325,11 @@ create_ssa_var_map (int flags)
   tree dest, use;
   tree stmt;
   stmt_ann_t ann;
-  use_optype uses;
-  def_optype defs;
-  unsigned x;
   var_map map;
+  ssa_op_iter iter;
 #ifdef ENABLE_CHECKING
   sbitmap used_in_real_ops;
   sbitmap used_in_virtual_ops;
-  vuse_optype vuses;
-  v_may_def_optype v_may_defs;
-  v_must_def_optype v_must_defs;
 #endif
 
   map = init_var_map (num_ssa_names + 1);
@@ -379,10 +373,8 @@ create_ssa_var_map (int flags)
          ann = stmt_ann (stmt);
 
          /* Register USE and DEF operands in each statement.  */
-         uses = USE_OPS (ann);
-         for (x = 0; x < NUM_USES (uses); x++)
+         FOR_EACH_SSA_TREE_OPERAND (use , stmt, iter, SSA_OP_USE)
            {
-             use = USE_OP (uses, x);
              register_ssa_partition (map, use, true);
 
 #ifdef ENABLE_CHECKING
@@ -390,10 +382,8 @@ create_ssa_var_map (int flags)
 #endif
            }
 
-         defs = DEF_OPS (ann);
-         for (x = 0; x < NUM_DEFS (defs); x++)
+         FOR_EACH_SSA_TREE_OPERAND (dest, stmt, iter, SSA_OP_DEF)
            {
-             dest = DEF_OP (defs, x);
              register_ssa_partition (map, dest, false);
 
 #ifdef ENABLE_CHECKING
@@ -403,26 +393,12 @@ create_ssa_var_map (int flags)
 
 #ifdef ENABLE_CHECKING
          /* Validate that virtual ops don't get used in funny ways.  */
-         vuses = VUSE_OPS (ann);
-         for (x = 0; x < NUM_VUSES (vuses); x++)
+         FOR_EACH_SSA_TREE_OPERAND (use, stmt, iter, 
+                                    SSA_OP_VIRTUAL_USES | SSA_OP_VMUSTDEF)
            {
-             tree var = VUSE_OP (vuses, x);
-             SET_BIT (used_in_virtual_ops, var_ann (SSA_NAME_VAR (var))->uid);
+             SET_BIT (used_in_virtual_ops, var_ann (SSA_NAME_VAR (use))->uid);
            }
 
-         v_may_defs = V_MAY_DEF_OPS (ann);
-         for (x = 0; x < NUM_V_MAY_DEFS (v_may_defs); x++)
-           {
-             tree var = V_MAY_DEF_OP (v_may_defs, x);
-             SET_BIT (used_in_virtual_ops, var_ann (SSA_NAME_VAR (var))->uid);
-           }
-           
-         v_must_defs = V_MUST_DEF_OPS (ann);
-         for (x = 0; x < NUM_V_MUST_DEFS (v_must_defs); x++)
-           {
-             tree var = V_MUST_DEF_OP (v_must_defs, x);
-             SET_BIT (used_in_virtual_ops, var_ann (SSA_NAME_VAR (var))->uid);
-           }       
 #endif /* ENABLE_CHECKING */
 
          mark_all_vars_used (bsi_stmt_ptr (bsi));
@@ -580,7 +556,7 @@ tree_live_info_p
 calculate_live_on_entry (var_map map)
 {
   tree_live_info_p live;
-  int num, i;
+  int i;
   basic_block bb;
   bitmap saw_def;
   tree phi, var, stmt;
@@ -588,9 +564,12 @@ calculate_live_on_entry (var_map map)
   edge e;
   varray_type stack;
   block_stmt_iterator bsi;
-  use_optype uses;
-  def_optype defs;
   stmt_ann_t ann;
+  ssa_op_iter iter;
+#ifdef ENABLE_CHECKING
+  int num;
+#endif
+
 
   saw_def = BITMAP_XMALLOC ();
 
@@ -637,19 +616,13 @@ calculate_live_on_entry (var_map map)
          get_stmt_operands (stmt);
          ann = stmt_ann (stmt);
 
-         uses = USE_OPS (ann);
-         num = NUM_USES (uses);
-         for (i = 0; i < num; i++)
+         FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_USE)
            {
-             op = USE_OP (uses, i);
              add_livein_if_notdef (live, saw_def, op, bb);
            }
 
-         defs = DEF_OPS (ann);
-         num = NUM_DEFS (defs);
-         for (i = 0; i < num; i++)
+         FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_DEF)
            {
-             op = DEF_OP (defs, i);
              set_if_valid (map, saw_def, op);
            }
        }
@@ -1040,7 +1013,7 @@ type_var_init (var_map map)
          || TREE_CODE (t) == PARM_DECL 
          || (DECL_P (t)
              && (DECL_REGISTER (t)
-                 || !DECL_ARTIFICIAL (t)
+                 || !DECL_IGNORED_P (t)
                  || DECL_RTL_SET_P (t))))
         continue;
 
@@ -1333,12 +1306,11 @@ build_tree_conflict_graph (tree_live_info_p liveinfo, tpa_p tpa,
   conflict_graph graph;
   var_map map;
   bitmap live;
-  int num, x, y, i;
+  int x, y, i;
   basic_block bb;
   varray_type partition_link, tpa_to_clear, tpa_nodes;
-  def_optype defs;
-  use_optype uses;
   unsigned l;
+  ssa_op_iter iter;
 
   map = live_var_map (liveinfo);
   graph = conflict_graph_new (num_var_partitions (map));
@@ -1416,20 +1388,13 @@ build_tree_conflict_graph (tree_live_info_p liveinfo, tpa_p tpa,
          if (!is_a_copy)
            {
              tree var;
-
-             defs = DEF_OPS (ann);
-             num = NUM_DEFS (defs);
-             for (x = 0; x < num; x++)
+             FOR_EACH_SSA_TREE_OPERAND (var, stmt, iter, SSA_OP_DEF)
                {
-                 var = DEF_OP (defs, x);
                  add_conflicts_if_valid (tpa, graph, map, live, var);
                }
 
-             uses = USE_OPS (ann);
-             num = NUM_USES (uses);
-             for (x = 0; x < num; x++)
+             FOR_EACH_SSA_TREE_OPERAND (var, stmt, iter, SSA_OP_USE)
                {
-                 var = USE_OP (uses, x);
                  set_if_valid (map, live, var);
                }
            }