cfgloop.c (verify_loop_structure): Verify dominators before using them.

2012-03-05  Richard Guenther  <rguenther@suse.de>

	* cfgloop.c (verify_loop_structure): Verify dominators before
	using them.
	* graphite-clast-to-gimple.c (graphite_verify): Do not verify
	dominators from here.
	* graphite-scop-detection.c (create_sese_edges): Likewise.
	* loop-doloop.c (doloop_optimize_loops): Likewise.
	* loop-init.c (loop_optimizer_init): Likewise.
	* loop-unroll.c (unroll_and_peel_loops): Likewise.
	* loop-unswitch.c (unswitch_loops): Likewise.
	* tree-ssa-loop-manip.c (tree_transform_and_unroll_loop): Likewise.
	* tree-parloops.c (parallelize_loops): Likewise.  Verify
	only when checking is enabled.
	* tree-loop-distribution.c (tree_loop_distribution): Likewise.

From-SVN: r184937

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 6242143782b284a5742436df20072571f2a211ac..b19d8834a741afd41e7b3f157771b057c113e591 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,19 @@
+2012-03-05  Richard Guenther  <rguenther@suse.de>
+
+       * cfgloop.c (verify_loop_structure): Verify dominators before
+       using them.
+       * graphite-clast-to-gimple.c (graphite_verify): Do not verify
+       dominators from here.
+       * graphite-scop-detection.c (create_sese_edges): Likewise.
+       * loop-doloop.c (doloop_optimize_loops): Likewise.
+       * loop-init.c (loop_optimizer_init): Likewise.
+       * loop-unroll.c (unroll_and_peel_loops): Likewise.
+       * loop-unswitch.c (unswitch_loops): Likewise.
+       * tree-ssa-loop-manip.c (tree_transform_and_unroll_loop): Likewise.
+       * tree-parloops.c (parallelize_loops): Likewise.  Verify
+       only when checking is enabled.
+       * tree-loop-distribution.c (tree_loop_distribution): Likewise.
+
 2012-03-05  Bernd Schmidt  <bernds@codesourcery.com>
 
        * genautomata.c (parse_automata_opt): New static function.

diff --git a/gcc/cfgloop.c b/gcc/cfgloop.c
index fa64797f5501cf7d91b1349b5366a0f4fd9e67cd..160486f13b12717d07eac7c66ac46f58c3012fac 100644 (file)
--- a/gcc/cfgloop.c
+++ b/gcc/cfgloop.c
@@ -1318,6 +1318,9 @@ verify_loop_structure (void)
   loop_iterator li;
   struct loop_exit *exit, *mexit;
 
+  /* We need up-to-date dominators, verify them.  */
+  verify_dominators (CDI_DOMINATORS);
+
   /* Check sizes.  */
   sizes = XCNEWVEC (unsigned, num);
   sizes[0] = 2;

diff --git a/gcc/graphite-clast-to-gimple.c b/gcc/graphite-clast-to-gimple.c
index abf88778f9e42b313175acd04c140de6173d8d74..6b6969be1e0f85b14c65e9daa3fd69a95c1621bd 100644 (file)
--- a/gcc/graphite-clast-to-gimple.c
+++ b/gcc/graphite-clast-to-gimple.c
@@ -55,7 +55,6 @@ graphite_verify (void)
 {
 #ifdef ENABLE_CHECKING
   verify_loop_structure ();
-  verify_dominators (CDI_DOMINATORS);
   verify_loop_closed_ssa (true);
 #endif
 }

diff --git a/gcc/graphite-scop-detection.c b/gcc/graphite-scop-detection.c
index 0a3680b1fa1268d4f22ef5738a103ab24e440dc0..3f4d7d8eb195e5aa9a5d71a15a290f90f9b91207 100644 (file)
--- a/gcc/graphite-scop-detection.c
+++ b/gcc/graphite-scop-detection.c
@@ -1026,7 +1026,6 @@ create_sese_edges (VEC (sd_region, heap) *regions)
 
 #ifdef ENABLE_CHECKING
   verify_loop_structure ();
-  verify_dominators (CDI_DOMINATORS);
   verify_ssa (false);
 #endif
 }

diff --git a/gcc/loop-doloop.c b/gcc/loop-doloop.c
index 5f645694107582d5c1ba533090e4dbff60dbe844..65ba651d67504c2cb4b65b867b1529257e16d558 100644 (file)
--- a/gcc/loop-doloop.c
+++ b/gcc/loop-doloop.c
@@ -747,7 +747,6 @@ doloop_optimize_loops (void)
   iv_analysis_done ();
 
 #ifdef ENABLE_CHECKING
-  verify_dominators (CDI_DOMINATORS);
   verify_loop_structure ();
 #endif
 }

diff --git a/gcc/loop-init.c b/gcc/loop-init.c
index 9184a148c40aa721a507381bcf1a08aba3ee62d7..daf5fa074100019221cea3a81e52e160c7124666 100644 (file)
--- a/gcc/loop-init.c
+++ b/gcc/loop-init.c
@@ -91,7 +91,6 @@ loop_optimizer_init (unsigned flags)
   flow_loops_dump (dump_file, NULL, 1);
 
 #ifdef ENABLE_CHECKING
-  verify_dominators (CDI_DOMINATORS);
   verify_loop_structure ();
 #endif
 }

diff --git a/gcc/loop-unroll.c b/gcc/loop-unroll.c
index 378b933baf0561bcdb92f3ede84a0414680b091a..5a658d85bcbf80b7c5b61a18c96fd389b5015d37 100644 (file)
--- a/gcc/loop-unroll.c
+++ b/gcc/loop-unroll.c
@@ -198,7 +198,6 @@ unroll_and_peel_loops (int flags)
       if (check)
        {
 #ifdef ENABLE_CHECKING
-         verify_dominators (CDI_DOMINATORS);
          verify_loop_structure ();
 #endif
        }
@@ -255,7 +254,6 @@ peel_loops_completely (int flags)
        {
          peel_loop_completely (loop);
 #ifdef ENABLE_CHECKING
-         verify_dominators (CDI_DOMINATORS);
          verify_loop_structure ();
 #endif
        }

diff --git a/gcc/loop-unswitch.c b/gcc/loop-unswitch.c
index 78da1154299ccf255e9ecad522d067cfc6860627..d6c4c226961abab1ba3a3628dbc5233b7fb7f3f8 100644 (file)
--- a/gcc/loop-unswitch.c
+++ b/gcc/loop-unswitch.c
@@ -149,7 +149,6 @@ unswitch_loops (void)
     {
       unswitch_single_loop (loop, NULL_RTX, 0);
 #ifdef ENABLE_CHECKING
-      verify_dominators (CDI_DOMINATORS);
       verify_loop_structure ();
 #endif
     }

diff --git a/gcc/tree-loop-distribution.c b/gcc/tree-loop-distribution.c
index 06dd14d42ce2ccef5a40b344d0e296252888fc03..0d21763c72e2fd17017fc838517c34bd16fa4aed 100644 (file)
--- a/gcc/tree-loop-distribution.c
+++ b/gcc/tree-loop-distribution.c
@@ -1293,7 +1293,9 @@ tree_loop_distribution (void)
            fprintf (dump_file, "Loop %d is the same.\n", num);
        }
 
+#ifdef ENABLE_CHECKING
       verify_loop_structure ();
+#endif
 
       VEC_free (gimple, heap, work_list);
     }

diff --git a/gcc/tree-parloops.c b/gcc/tree-parloops.c
index e791ac3ed49136b4034cdce3a039c623764cf396..abae3fd6e1ddd4bd097d481cdb7447290f97037d 100644 (file)
--- a/gcc/tree-parloops.c
+++ b/gcc/tree-parloops.c
@@ -2226,10 +2226,11 @@ parallelize_loops (void)
       }
       gen_parallel_loop (loop, reduction_list,
                         n_threads, &niter_desc);
+#ifdef ENABLE_CHECKING
       verify_flow_info ();
-      verify_dominators (CDI_DOMINATORS);
       verify_loop_structure ();
       verify_loop_closed_ssa (true);
+#endif
     }
 
   free_stmt_vec_info_vec ();

diff --git a/gcc/tree-ssa-loop-manip.c b/gcc/tree-ssa-loop-manip.c
index f6e2e9c937f358e412a63a571e3f6a5fdb3b2240..a0123ffcd17be6cadab9ac68adfc74117bab3f57 100644 (file)
--- a/gcc/tree-ssa-loop-manip.c
+++ b/gcc/tree-ssa-loop-manip.c
@@ -1096,7 +1096,6 @@ tree_transform_and_unroll_loop (struct loop *loop, unsigned factor,
 
 #ifdef ENABLE_CHECKING
   verify_flow_info ();
-  verify_dominators (CDI_DOMINATORS);
   verify_loop_structure ();
   verify_loop_closed_ssa (true);
 #endif