Fix string pool statistics.

2018-11-05  Martin Liska  <mliska@suse.cz>

	* symtab.c (ht_dump_statistics): Make dump conditional
	based on alloc_subobject.

From-SVN: r265797

diff --git a/libcpp/ChangeLog b/libcpp/ChangeLog
index d9eaa04d4278359bece557e35101695f122e901d..36ee636bf9cc5079717830fc98b8e694a8871dd6 100644 (file)
--- a/libcpp/ChangeLog
+++ b/libcpp/ChangeLog
@@ -1,3 +1,8 @@
+2018-11-05  Martin Liska  <mliska@suse.cz>
+
+       * symtab.c (ht_dump_statistics): Make dump conditional
+       based on alloc_subobject.
+
 2018-10-31  Joseph Myers  <joseph@codesourcery.com>
 
        PR bootstrap/82856

diff --git a/libcpp/symtab.c b/libcpp/symtab.c
index fd86c849f7f2411b78fb282b177dc9b801369e35..e6e5bcb1cef9293fd79ec19240a2d737dbdb4573 100644 (file)
--- a/libcpp/symtab.c
+++ b/libcpp/symtab.c
@@ -304,7 +304,6 @@ ht_dump_statistics (cpp_hash_table *table)
   while (++p < limit);
 
   nelts = table->nelements;
-  overhead = obstack_memory_used (&table->stack) - total_bytes;
   headers = table->nslots * sizeof (hashnode);
 
   fprintf (stderr, "\nString pool\nentries\t\t%lu\n",
@@ -315,9 +314,16 @@ ht_dump_statistics (cpp_hash_table *table)
           (unsigned long) table->nslots);
   fprintf (stderr, "deleted\t\t%lu\n",
           (unsigned long) deleted);
-  fprintf (stderr, "bytes\t\t%lu%c (%lu%c overhead)\n",
-          SCALE (total_bytes), LABEL (total_bytes),
-          SCALE (overhead), LABEL (overhead));
+
+  if (table->alloc_subobject)
+    fprintf (stderr, "GGC bytes\t%lu%c\n",
+            SCALE (total_bytes), LABEL (total_bytes));
+  else
+    {
+      overhead = obstack_memory_used (&table->stack) - total_bytes;
+      fprintf (stderr, "obstack bytes\t%lu%c (%lu%c overhead)\n",
+              SCALE (total_bytes), LABEL (total_bytes));
+    }
   fprintf (stderr, "table size\t%lu%c\n",
           SCALE (headers), LABEL (headers));