From: Trevor Saunders <tbsaunde+...@tbsaunde.org> gcc/ChangeLog:
2017-07-27 Trevor Saunders <tbsaunde+...@tbsaunde.org> * bitmap.c (bitmap_alloc): Adjust. (bitmap_gc_alloc): Likewise. * bitmap.h (bitmap_initialize_stat): Remove _stat from name. --- gcc/bitmap.c | 4 ++-- gcc/bitmap.h | 3 +-- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/gcc/bitmap.c b/gcc/bitmap.c index be8d0cc6247..03f6923db2f 100644 --- 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 ca047666dc1..348032360f2 100644 --- 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); -- 2.11.0