diff options
| author | Trevor Saunders <tbsaunde+gcc@tbsaunde.org> | 2017-07-29 01:39:31 +0000 |
|---|---|---|
| committer | Trevor Saunders <tbsaunde@gcc.gnu.org> | 2017-07-29 01:39:31 +0000 |
| commit | 3fe793df7c4952bde47b2811210b7e2c2cc0ff97 (patch) | |
| tree | ce4087bee2f7a4036894fef11f1f55c23a5d9a14 | |
| parent | 22a7303de24b120c7124d0b2a4ad778bd452319e (diff) | |
| download | gcc-3fe793df7c4952bde47b2811210b7e2c2cc0ff97.zip gcc-3fe793df7c4952bde47b2811210b7e2c2cc0ff97.tar.gz gcc-3fe793df7c4952bde47b2811210b7e2c2cc0ff97.tar.bz2 | |
simplify the bitmap alloc_stat functions with c++
gcc/fortran/ChangeLog:
2017-07-28 Trevor Saunders <tbsaunde+gcc@tbsaunde.org>
* resolve.c (find_reachable_labels): Adjust.
gcc/ChangeLog:
2017-07-28 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.
From-SVN: r250709
| -rw-r--r-- | gcc/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/bitmap.c | 4 | ||||
| -rw-r--r-- | gcc/bitmap.h | 14 | ||||
| -rw-r--r-- | gcc/fortran/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/fortran/resolve.c | 2 |
5 files changed, 19 insertions, 13 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 7e3ea64..514167e 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,13 @@ 2017-07-28 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. + +2017-07-28 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> + * rtl.c (shallow_copy_rtx_stat): Remove _stat from name. * rtl.h (shallow_copy_rtx): Remove macro. diff --git a/gcc/bitmap.c b/gcc/bitmap.c index 7bebeec..be8d0cc 100644 --- a/gcc/bitmap.c +++ b/gcc/bitmap.c @@ -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; diff --git a/gcc/bitmap.h b/gcc/bitmap.h index ad53984..ca04766 100644 --- a/gcc/bitmap.h +++ b/gcc/bitmap.h @@ -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)) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 22b3f2c..2b9aba6 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,7 @@ +2017-07-28 Trevor Saunders <tbsaunde+gcc@tbsaunde.org> + + * resolve.c (find_reachable_labels): Adjust. + 2017-07-25 Jakub Jelinek <jakub@redhat.com> * ioparm.def: Use 1U << 31 instead of 1 << 31 as flags2 mask. diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 12903a4..5caf767 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -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 |