tree-ssa.c (verify_use): Fix comment.

	* tree-ssa.c (verify_use): Fix comment.
	(verify_phi_args): Check that the number of incoming edges matches
	the number of PHI arguments.  Check that each PHI argument is
	either an SSA_NAME or an invariant.  Coalesce tests for PHIs for
	dead or duplicated edges.  Clear e->aux earlier and avoid separate
	loop to clear e->aux and test for missed edges.
	(verify_ssa): Remove first walk over statements.  Move checking
	of PHI args into verify_phi_args.  Move checking of statements
	with aliased stores and V_MAY_DEFS into the remaining loop over
	the statements.  Register defs by walking through the formal
	SSA_NAME table.

From-SVN: r91000

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 19fdee8f8e248306488c6783c8e778ed314ffffc..50c11f89e71c821b928a1212de6292815852afde 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,17 @@
+2004-11-21  Jeff Law  <law@redhat.com>
+
+       * tree-ssa.c (verify_use): Fix comment.
+       (verify_phi_args): Check that the number of incoming edges matches
+       the number of PHI arguments.  Check that each PHI argument is
+       either an SSA_NAME or an invariant.  Coalesce tests for PHIs for
+       dead or duplicated edges.  Clear e->aux earlier and avoid separate
+       loop to clear e->aux and test for missed edges.
+       (verify_ssa): Remove first walk over statements.  Move checking
+       of PHI args into verify_phi_args.  Move checking of statements
+       with aliased stores and V_MAY_DEFS into the remaining loop over
+       the statements.  Register defs by walking through the formal
+       SSA_NAME table.
+
 2004-11-21  Roger Sayle  <roger@eyesopen.com>
 
        PR middle-end/18520

diff --git a/gcc/tree-ssa.c b/gcc/tree-ssa.c
index 054ef870b87f9d194fd17aef6308b50b1097dc63..056775d2e561a8be8af0298f49fc3d9c66ffd552 100644 (file)
--- a/gcc/tree-ssa.c
+++ b/gcc/tree-ssa.c
@@ -288,8 +288,6 @@ verify_use (basic_block bb, basic_block def_bb, tree ssa_name,
 /* Return true if any of the arguments for PHI node PHI at block BB is
    malformed.
 
-   IDOM contains immediate dominator information for the flowgraph.
-
    DEFINITION_BLOCK is an array of basic blocks indexed by SSA_NAME version
       numbers.  If DEFINITION_BLOCK[SSA_NAME_VERSION] is set, it means that the
       block in that array slot contains the definition of SSA_NAME.  */
@@ -299,9 +297,16 @@ verify_phi_args (tree phi, basic_block bb, basic_block *definition_block)
 {
   edge e;
   bool err = false;
-  int i, phi_num_args = PHI_NUM_ARGS (phi);
+  unsigned i, phi_num_args = PHI_NUM_ARGS (phi);
   edge_iterator ei;
 
+  if (EDGE_COUNT (bb->preds) != phi_num_args)
+    {
+      error ("Incoming edge count does not match number of PHI arguments\n");
+      err = true;
+      goto error;
+    }
+
   /* Mark all the incoming edges.  */
   FOR_EACH_EDGE (e, ei, bb->preds)
     e->aux = (void *) 1;
@@ -310,6 +315,12 @@ verify_phi_args (tree phi, basic_block bb, basic_block *definition_block)
     {
       tree op = PHI_ARG_DEF (phi, i);
 
+      if (TREE_CODE (op) != SSA_NAME && !is_gimple_min_invariant (op))
+       {
+         error ("PHI argument is not SSA_NAME, or invariant");
+         err = true;
+       }
+
       e = PHI_ARG_EDGE (phi, i);
 
       if (TREE_CODE (op) == SSA_NAME)
@@ -327,18 +338,11 @@ verify_phi_args (tree phi, basic_block bb, basic_block *definition_block)
 
       if (e->aux == (void *) 0)
        {
-         error ("PHI argument flowing through dead edge %d->%d\n",
+         error ("PHI argument flowing through dead or duplicated edge %d->%d\n",
                 e->src->index, e->dest->index);
          err = true;
        }
 
-      if (e->aux == (void *) 2)
-       {
-         error ("PHI argument duplicated for edge %d->%d\n", e->src->index,
-                e->dest->index);
-         err = true;
-       }
-
       if (err)
        {
          fprintf (stderr, "PHI argument\n");
@@ -346,18 +350,6 @@ verify_phi_args (tree phi, basic_block bb, basic_block *definition_block)
          goto error;
        }
 
-      e->aux = (void *) 2;
-    }
-
-  FOR_EACH_EDGE (e, ei, bb->preds)
-    {
-      if (e->aux != (void *) 2)
-       {
-         error ("No argument flowing through edge %d->%d\n", e->src->index,
-                e->dest->index);
-         err = true;
-         goto error;
-       }
       e->aux = (void *) 0;
     }
 
@@ -599,65 +591,25 @@ verify_ssa (void)
 
   /* Keep track of SSA names present in the IL.  */
   for (i = 1; i < num_ssa_names; i++)
-    if (ssa_name (i))
-      TREE_VISITED (ssa_name (i)) = 0;
-
-  calculate_dominance_info (CDI_DOMINATORS);
-
-  /* Verify and register all the SSA_NAME definitions found in the
-     function.  */
-  FOR_EACH_BB (bb)
     {
-      tree phi;
-      block_stmt_iterator bsi;
-
-      for (phi = phi_nodes (bb); phi; phi = PHI_CHAIN (phi))
-       {
-         int i;
-         if (verify_def (bb, definition_block, PHI_RESULT (phi), phi,
-                       !is_gimple_reg (PHI_RESULT (phi))))
-         goto err;
-         for (i = 0; i < PHI_NUM_ARGS (phi); i++)
-           {
-             tree def = PHI_ARG_DEF (phi, i);
-             if (TREE_CODE (def) != SSA_NAME && !is_gimple_min_invariant (def))
-               {
-                 error ("PHI argument is not SSA_NAME, or invariant");
-                 print_generic_stmt (stderr, phi, TDF_VOPS);
-                 goto err;
-               }
-           }
-       }
-
-      for (bsi = bsi_start (bb); !bsi_end_p (bsi); bsi_next (&bsi))
+      tree name = ssa_name (i);
+      if (name)
        {
          tree stmt;
+         TREE_VISITED (name) = 0;
 
-         stmt = bsi_stmt (bsi);
-         get_stmt_operands (stmt);
-
-         if (stmt_ann (stmt)->makes_aliased_stores 
-             && NUM_V_MAY_DEFS (STMT_V_MAY_DEF_OPS (stmt)) == 0)
+         stmt = SSA_NAME_DEF_STMT (name);
+         if (!IS_EMPTY_STMT (stmt))
            {
-             error ("Statement makes aliased stores, but has no V_MAY_DEFS");
-             print_generic_stmt (stderr, stmt, TDF_VOPS);
-             goto err;
-           }
-           
-         FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_VIRTUAL_DEFS)
-           {
-             if (verify_def (bb, definition_block, op, stmt, true))
-               goto err;
-           }
-          
-         FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_DEF)
-           {
-             if (verify_def (bb, definition_block, op, stmt, false))
-               goto err;
+             basic_block bb = bb_for_stmt (stmt);
+             verify_def (bb, definition_block,
+                         name, stmt, !is_gimple_reg (name));
+
            }
        }
     }
 
+  calculate_dominance_info (CDI_DOMINATORS);
 
   /* Now verify all the uses and make sure they agree with the definitions
      found in the previous pass.  */
@@ -693,18 +645,20 @@ verify_ssa (void)
        {
          tree stmt = bsi_stmt (bsi);
 
-         FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_VIRTUAL_USES | SSA_OP_VIRTUAL_KILLS)
-           {
-             if (verify_use (bb, definition_block[SSA_NAME_VERSION (op)],
-                             op, stmt, false, true,
-                             names_defined_in_bb))
-               goto err;
-           }
+             get_stmt_operands (stmt);
+
+             if (stmt_ann (stmt)->makes_aliased_stores 
+                 && NUM_V_MAY_DEFS (STMT_V_MAY_DEF_OPS (stmt)) == 0)
+               {
+                 error ("Statement makes aliased stores, but has no V_MAY_DEFS");
+                 print_generic_stmt (stderr, stmt, TDF_VOPS);
+                 goto err;
+               }
 
-         FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_USE)
+         FOR_EACH_SSA_TREE_OPERAND (op, stmt, iter, SSA_OP_ALL_USES)
            {
              if (verify_use (bb, definition_block[SSA_NAME_VERSION (op)],
-                             op, stmt, false, false,
+                             op, stmt, false, !is_gimple_reg (op),
                              names_defined_in_bb))
                goto err;
            }