@@ -273,7 +273,7 @@ bitmap_obstack_release (bitmap_obstack *bit_obstack)
it on the default bitmap obstack. */
bitmap
-bitmap_obstack_alloc_stat (bitmap_obstack *bit_obstack MEM_STAT_DECL)
+bitmap_alloc (bitmap_obstack *bit_obstack MEM_STAT_DECL)
{
bitmap map;
@@ -295,7 +295,7 @@ bitmap_obstack_alloc_stat (bitmap_obstack *bit_obstack MEM_STAT_DECL)
/* Create a new GCd bitmap. */
bitmap
-bitmap_gc_alloc_stat (ALONE_MEM_STAT_DECL)
+bitmap_gc_alloc (ALONE_MEM_STAT_DECL)
{
bitmap map;
@@ -345,10 +345,10 @@ bitmap_initialize_stat (bitmap head, bitmap_obstack *obstack MEM_STAT_DECL)
#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_obstack_alloc_stat (bitmap_obstack *obstack MEM_STAT_DECL);
-#define bitmap_obstack_alloc(t) bitmap_obstack_alloc_stat (t MEM_STAT_INFO)
-extern bitmap bitmap_gc_alloc_stat (ALONE_MEM_STAT_DECL);
-#define bitmap_gc_alloc() bitmap_gc_alloc_stat (ALONE_MEM_STAT_INFO)
+extern bitmap bitmap_alloc (bitmap_obstack *obstack CXX_MEM_STAT_INFO);
+#define BITMAP_ALLOC bitmap_alloc
+extern bitmap bitmap_gc_alloc (ALONE_CXX_MEM_STAT_INFO);
+#define BITMAP_GGC_ALLOC bitmap_gc_alloc
extern void bitmap_obstack_free (bitmap);
/* A few compatibility/functions macros for compatibility with sbitmaps */
@@ -365,12 +365,6 @@ extern unsigned bitmap_last_set_bit (const_bitmap);
/* Compute bitmap hash (for purposes of hashing etc.) */
extern hashval_t bitmap_hash (const_bitmap);
-/* Allocate a bitmap from a bit obstack. */
-#define BITMAP_ALLOC(OBSTACK) bitmap_obstack_alloc (OBSTACK)
-
-/* Allocate a gc'd bitmap. */
-#define BITMAP_GGC_ALLOC() bitmap_gc_alloc ()
-
/* Do any cleanup needed on a bitmap when it is no longer used. */
#define BITMAP_FREE(BITMAP) \
((void) (bitmap_obstack_free ((bitmap) BITMAP), (BITMAP) = (bitmap) NULL))
@@ -9098,7 +9098,7 @@ find_reachable_labels (gfc_code *block)
if (!block)
return;
- cs_base->reachable_labels = bitmap_obstack_alloc (&labels_obstack);
+ cs_base->reachable_labels = bitmap_alloc (&labels_obstack);
/* Collect labels in this block. We don't keep those corresponding
to END {IF|SELECT}, these are checked in resolve_branch by going
From: Trevor Saunders <tbsaunde+gcc@tbsaunde.org> gcc/fortran/ChangeLog: 2017-07-27 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> * resolve.c (find_reachable_labels): Adjust. gcc/ChangeLog: 2017-07-27 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> * bitmap.c (bitmap_obstack_alloc_stat): Rename to bitmap_alloc. (bitmap_gc_alloc_stat): Rename to bitmap_gc_alloc. * bitmap.h (bitmap_obstack_alloc_stat): Adjust prototype. (bitmap_gc_alloc_stat): Likewise. (BITMAP_ALLOC, BITMAP_GGC_ALLOC): Adjust. --- gcc/bitmap.c | 4 ++-- gcc/bitmap.h | 14 ++++---------- gcc/fortran/resolve.c | 2 +- 3 files changed, 7 insertions(+), 13 deletions(-)