ra-colorize.c (reset_lists): Move variable declaration inside ENABLE_CHECKING to...

2004-09-09  Eric Christopher  <echristo@redhat.com>

	* ra-colorize.c (reset_lists): Move variable declaration inside
	ENABLE_CHECKING to avoid unused variable warnings when
	not --enable-checking.
	(check_colors): Ditto.

From-SVN: r87262

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index e1aa6e799aa8b61c9a1ccbc532bcb7c83da2bb6e..e1d5834ad6ee23d9f8d07a9ef26097668c177581 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,10 @@
+2004-09-09  Eric Christopher  <echristo@redhat.com>
+
+       * ra-colorize.c (reset_lists): Move variable declaration inside
+       ENABLE_CHECKING to avoid unused variable warnings when
+       not --enable-checking.
+       (check_colors): Ditto.
+
 2004-09-09  Mike Stump  <mrs@apple.com>
 
        * version.c (version_string): Bump to 4.0.0.
@@ -25,7 +32,7 @@
 
 2004-09-09  Ulrich Weigand  <uweigand@de.ibm.com>
 
-       * reload.c (find_reloads_address): Pass correct operand to 
+       * reload.c (find_reloads_address): Pass correct operand to
        maybe_memory_address_p.
 
 2004-09-09  Daniel Berlin  <dberlin@dberlin.org>
@@ -55,7 +62,7 @@
        (dump_alias_stats): Ditto.
        * doc/passes.texi: Remove blurb about points-to analysis.
        * fortran/Make-lang.in: Remove tree-alias-*.o.
-       
+
 2004-09-09  Richard Sandiford  <rsandifo@redhat.com>
 
        * genattrtab.c (write_insn_cases): New function, split out from

diff --git a/gcc/ra-colorize.c b/gcc/ra-colorize.c
index 829a2b73a062fd05d86c79bf7d765317e798f46c..fe963e4273cf3cd13acd4ec46a2d047775aa4139 100644 (file)
--- a/gcc/ra-colorize.c
+++ b/gcc/ra-colorize.c
@@ -210,7 +210,6 @@ void
 reset_lists (void)
 {
   struct dlist *d;
-  unsigned int i;
 
   gcc_assert (!WEBS(SIMPLIFY));
   gcc_assert (!WEBS(SIMPLIFY_SPILL));
@@ -249,13 +248,17 @@ reset_lists (void)
 
 #ifdef ENABLE_CHECKING
   /* Sanity check, that we only have free, initial or precolored webs. */
-  for (i = 0; i < num_webs; i++)
-    {
-      struct web *web = ID2WEB (i);
-      
-      gcc_assert (web->type == INITIAL || web->type == FREE
-                 || web->type == PRECOLORED);
-    }
+  {
+    unsigned int i;
+
+    for (i = 0; i < num_webs; i++)
+      {
+       struct web *web = ID2WEB (i);
+
+       gcc_assert (web->type == INITIAL || web->type == FREE
+                   || web->type == PRECOLORED);
+      }
+  }
 #endif
   free_dlist (&mv_worklist);
   free_dlist (&mv_coalesced);
@@ -1260,7 +1263,7 @@ colorize_one_web (struct web *web, int hard)
   HARD_REG_SET bias;
 
   CLEAR_HARD_REG_SET (fat_colors);
-  
+
   if (web->regno >= max_normal_pseudo)
     hard = 0;
 
@@ -1973,11 +1976,11 @@ check_colors (void)
       struct web *web = id2web[i];
       struct web *aweb = alias (web);
       struct conflict_link *wl;
-      int nregs, c;
+      int nregs;
 
       if (web->regno >= max_normal_pseudo)
        continue;
-      
+
       switch (aweb->type)
        {
        case SPILLED:
@@ -1996,9 +1999,12 @@ check_colors (void)
        }
 
 #ifdef ENABLE_CHECKING
-      /* The color must be valid for the original usable_regs.  */
-      for (c = 0; c < nregs; c++)
-       gcc_assert (TEST_HARD_REG_BIT (web->usable_regs, aweb->color + c));
+       /* The color must be valid for the original usable_regs.  */
+      {
+       int c;
+       for (c = 0; c < nregs; c++)
+         gcc_assert (TEST_HARD_REG_BIT (web->usable_regs, aweb->color + c));
+      }
 #endif
       /* Search the original (pre-coalesce) conflict list.  In the current
         one some imprecise conflicts may be noted (due to combine() or