re PR other/22337 (zone collector does not build)

2005-07-25  Serge Belyshev  <belyshev@depni.sinp.msu.ru>

        PR other/22337
        * ggc-zone.c (ggc_alloc_zone_stat): Do not use CHUNK_OVERHEAD.
        (ggc_print_statistics): Initialize variable before use.

From-SVN: r102362

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 530a11dfab28d6c462ad60cac05b8479072e3a61..413aa48e6aa64c467af81ec56f816b9df1283bf1 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2005-07-25  Serge Belyshev  <belyshev@depni.sinp.msu.ru>
+
+       PR other/22337
+       * ggc-zone.c (ggc_alloc_zone_stat): Do not use CHUNK_OVERHEAD.
+       (ggc_print_statistics): Initialize variable before use.
+
 2005-07-25  Richard Guenther  <rguenther@suse.de>
 
        * tree-dfa.c (mark_new_vars_to_rename): Protect against

diff --git a/gcc/ggc-zone.c b/gcc/ggc-zone.c
index 40d751907f7828a895494308c69696aa64e03522..1d6edfb707ec6cdd4979da1d44c21e59634d7212 100644 (file)
--- a/gcc/ggc-zone.c
+++ b/gcc/ggc-zone.c
@@ -1229,7 +1229,7 @@ ggc_alloc_zone_stat (size_t orig_size, struct alloc_zone *zone
      information is used in deciding when to collect.  */
   zone->allocated += size;
   
-  timevar_ggc_mem_total += (size + CHUNK_OVERHEAD);
+  timevar_ggc_mem_total += size;
 
 #ifdef GATHER_STATISTICS
   ggc_record_overhead (orig_size, size - orig_size, result PASS_MEM_STAT);
@@ -2049,7 +2049,7 @@ ggc_print_statistics (void)
       pte_overhead += PAGE_L2_SIZE * sizeof (struct page_entry *);
 #else
   {
-    struct page_table_chain *table;
+    page_table table = G.lookup;
     pte_overhead = 0;
     while (table)
       {