use c++ for bitmap_initialize

gcc/ChangeLog:

2017-07-28  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>

	* bitmap.c (bitmap_alloc): Adjust.
	(bitmap_gc_alloc): Likewise.
	* bitmap.h (bitmap_initialize_stat): Remove _stat from name.

From-SVN: r250710

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 514167e6f8bc8564f7b72fdb690c7ce4d861cd6b..4be715504580d1f68e755fd972af5e6673662472 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2017-07-28  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
+
+       * bitmap.c (bitmap_alloc): Adjust.
+       (bitmap_gc_alloc): Likewise.
+       * bitmap.h (bitmap_initialize_stat): Remove _stat from name.
+
 2017-07-28  Trevor Saunders  <tbsaunde+gcc@tbsaunde.org>
 
        * bitmap.c (bitmap_obstack_alloc_stat): Rename to bitmap_alloc.

diff --git a/gcc/bitmap.c b/gcc/bitmap.c
index be8d0cc624741adc44b67a3ce860c69e80ea1477..03f6923db2fd8afcbc91852d3dff450698a0335f 100644 (file)
--- a/gcc/bitmap.c
+++ b/gcc/bitmap.c
@@ -284,7 +284,7 @@ bitmap_alloc (bitmap_obstack *bit_obstack MEM_STAT_DECL)
     bit_obstack->heads = (struct bitmap_head *) map->first;
   else
     map = XOBNEW (&bit_obstack->obstack, bitmap_head);
-  bitmap_initialize_stat (map, bit_obstack PASS_MEM_STAT);
+  bitmap_initialize (map, bit_obstack PASS_MEM_STAT);
 
   if (GATHER_STATISTICS)
     register_overhead (map, sizeof (bitmap_head));
@@ -300,7 +300,7 @@ bitmap_gc_alloc (ALONE_MEM_STAT_DECL)
   bitmap map;
 
   map = ggc_alloc<bitmap_head> ();
-  bitmap_initialize_stat (map, NULL PASS_MEM_STAT);
+  bitmap_initialize (map, NULL PASS_MEM_STAT);
 
   if (GATHER_STATISTICS)
     register_overhead (map, sizeof (bitmap_head));

diff --git a/gcc/bitmap.h b/gcc/bitmap.h
index ca047666dc1f8d84c0506f221b09bd92835b4c06..348032360f29c9fdf4e903fe0c9fb191f21a99c0 100644 (file)
--- a/gcc/bitmap.h
+++ b/gcc/bitmap.h
@@ -335,14 +335,13 @@ extern void dump_bitmap_statistics (void);
    to allocate from, NULL for GC'd bitmap.  */
 
 static inline void
-bitmap_initialize_stat (bitmap head, bitmap_obstack *obstack MEM_STAT_DECL)
+bitmap_initialize (bitmap head, bitmap_obstack *obstack CXX_MEM_STAT_INFO)
 {
   head->first = head->current = NULL;
   head->obstack = obstack;
   if (GATHER_STATISTICS)
     bitmap_register (head PASS_MEM_STAT);
 }
-#define bitmap_initialize(h,o) bitmap_initialize_stat (h,o MEM_STAT_INFO)
 
 /* Allocate and free bitmaps from obstack, malloc and gc'd memory.  */
 extern bitmap bitmap_alloc (bitmap_obstack *obstack CXX_MEM_STAT_INFO);