Change Remaining _optype references outside of tree-ssa-operands and tree-flow-inline.himmuse-rewrite-branch

git-svn-id: https://gcc.gnu.org/svn/gcc/branches/immuse-rewrite-branch@89563 138bc75d-0d04-0410-961f-82ee72b054a4

8 files changed, 13 insertions, 23 deletions

diff --git a/gcc/lambda-code.c b/gcc/lambda-code.c
index 0016d6a7f36..ac0e171eac9 100644
--- a/gcc/lambda-code.c
+++ b/gcc/lambda-code.c
@@ -1919,8 +1919,8 @@ lambda_loopnest_to_gcc_loopnest (struct loop *old_loopnest,
       tree oldiv = VEC_index (tree, old_ivs, i);
       tree oldiv_stmt = SSA_NAME_DEF_STMT (oldiv);
 
-      gcc_assert (NUM_DEFS (STMT_DEF_OPS (oldiv_stmt)) == 1);
-      oldiv_def = DEF_OP (STMT_DEF_OPS (oldiv_stmt), 0);
+      oldiv_def = SINGLE_SSA_TREE_OPERAND (oldiv_stmt, SSA_OP_DEF);
+      gcc_assert (oldiv_def != NULL_TREE);
 
       FOR_EACH_IMM_USE_SAFE (imm_use, imm_iter, oldiv_def)
 	{
diff --git a/gcc/tree-data-ref.c b/gcc/tree-data-ref.c
index 069dcde3a7c..21fa39d1f62 100644
--- a/gcc/tree-data-ref.c
+++ b/gcc/tree-data-ref.c
@@ -1766,14 +1766,11 @@ find_data_references_in_loop (struct loop *loop, varray_type *datarefs)
       for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi))
         {
 	  tree stmt = bsi_stmt (bsi);
-	  stmt_ann_t ann = stmt_ann (stmt);
 
 	  if (TREE_CODE (stmt) != MODIFY_EXPR)
 	    continue;
 
-	  if (!VUSE_OPS (ann)
-	      && !V_MUST_DEF_OPS (ann)
-	      && !V_MAY_DEF_OPS (ann))
+	  if (ZERO_SSA_OPERANDS (stmt, SSA_OP_ALL_USES))
 	    continue;
 
 	  /* In the GIMPLE representation, a modify expression
diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c
index 84a6904cce2..ccb52a37a47 100644
--- a/gcc/tree-into-ssa.c
+++ b/gcc/tree-into-ssa.c
@@ -347,7 +347,7 @@ ssa_mark_phi_uses (struct dom_walk_data *walk_data, basic_block bb)
    for every variable in the function.  For every statement S in block
    BB:
 
-   1- Variables defined by S in DEF_OPS(S) are marked in the bitmap
+   1- Variables defined by S in the DEFS of S are marked in the bitmap
       WALK_DATA->GLOBAL_DATA->KILLS.
 
    2- If S uses a variable VAR and there is no preceding kill of VAR,
diff --git a/gcc/tree-outof-ssa.c b/gcc/tree-outof-ssa.c
index f45d74a0ec9..4b618d01861 100644
--- a/gcc/tree-outof-ssa.c
+++ b/gcc/tree-outof-ssa.c
@@ -1663,12 +1663,8 @@ find_replaceable_in_bb (temp_expr_table_p tab, basic_block bb)
 	  free_value_expr (tab, p);
 	}
 
-      /* A V_MAY_DEF kills any expression using a virtual operand.  */
-      if (NUM_V_MAY_DEFS (V_MAY_DEF_OPS (ann)) > 0)
-        kill_virtual_exprs (tab, true);
-	
-      /* A V_MUST_DEF kills any expression using a virtual operand.  */
-      if (NUM_V_MUST_DEFS (V_MUST_DEF_OPS (ann)) > 0)
+      /* A V_{MAY,MUST}_DEF kills any expression using a virtual operand.  */
+      if (!ZERO_SSA_OPERANDS (stmt, SSA_OP_VIRTUAL_DEFS))
         kill_virtual_exprs (tab, true);
     }
 }
@@ -1719,7 +1715,8 @@ dump_replaceable_exprs (FILE *f, tree *expr)
     if (expr[x])
       {
         stmt = expr[x];
-	var = DEF_OP (STMT_DEF_OPS (stmt), 0);
+	var = SINGLE_SSA_TREE_OPERAND (stmt, SSA_OP_DEF);
+	gcc_assert (var != NULL_TREE);
 	print_generic_expr (f, var, TDF_SLIM);
 	fprintf (f, " replace with --> ");
 	print_generic_expr (f, TREE_OPERAND (stmt, 1), TDF_SLIM);
diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index a73f0e47249..a5b50f8ff46 100644
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -887,9 +887,7 @@ sra_walk_function (const struct sra_walk_fns *fns)
 
 	/* If the statement has no virtual operands, then it doesn't
 	   make any structure references that we care about.  */
-	if (NUM_V_MAY_DEFS (V_MAY_DEF_OPS (ann)) == 0
-	    && NUM_VUSES (VUSE_OPS (ann)) == 0
-	    && NUM_V_MUST_DEFS (V_MUST_DEF_OPS (ann)) == 0)
+	if (ZERO_SSA_OPERANDS (stmt, (SSA_OP_VIRTUAL_DEFS | SSA_OP_VUSE)))
 	  continue;
 
 	switch (TREE_CODE (stmt))
diff --git a/gcc/tree-ssa-forwprop.c b/gcc/tree-ssa-forwprop.c
index 4ac8a9fba28..0be7a6aca18 100644
--- a/gcc/tree-ssa-forwprop.c
+++ b/gcc/tree-ssa-forwprop.c
@@ -328,10 +328,10 @@ substitute_single_use_vars (varray_type *cond_worklist,
       propagated_uses = 0;
       num_uses = 0;
 
-      if (NUM_DEFS (STMT_DEF_OPS (def_stmt)) != 1)
+      def = SINGLE_SSA_TREE_OPERAND (def_stmt, SSA_OP_DEF);
+      if (def == NULL)
         continue;
 
-      def = DEF_OP (STMT_DEF_OPS (def_stmt), 0);
       /* If TEST_VAR is used more than once and is not a boolean set
 	 via TRUTH_NOT_EXPR with another SSA_NAME as its argument, then
 	 we can not optimize.  */
diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index 02b05da368f..fc857c323ea 100644
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -600,7 +600,7 @@ verify_ssa (bool check_modified_stmt)
 	    }
 
 	  if (stmt_ann (stmt)->makes_aliased_stores 
-	      && NUM_V_MAY_DEFS (STMT_V_MAY_DEF_OPS (stmt)) == 0)
+	      && ZERO_SSA_OPERANDS (stmt, SSA_OP_VMAYDEF))
 	    {
 	      error ("Statement makes aliased stores, but has no V_MAY_DEFS");
 	      print_generic_stmt (stderr, stmt, TDF_VOPS);
diff --git a/gcc/tree-tailcall.c b/gcc/tree-tailcall.c
index 185845341a9..358a3f0d8c6 100644
--- a/gcc/tree-tailcall.c
+++ b/gcc/tree-tailcall.c
@@ -404,9 +404,7 @@ find_tail_calls (basic_block bb, struct tailcall **ret)
 
       /* If the statement has virtual or volatile operands, fail.  */
       ann = stmt_ann (stmt);
-      if (NUM_V_MAY_DEFS (V_MAY_DEF_OPS (ann))
-          || NUM_V_MUST_DEFS (V_MUST_DEF_OPS (ann))
-	  || NUM_VUSES (VUSE_OPS (ann))
+      if (!ZERO_SSA_OPERANDS (stmt, (SSA_OP_VUSE | SSA_OP_VIRTUAL_DEFS))
 	  || ann->has_volatile_ops)
 	return;
     }