diff options
| author | Segher Boessenkool <segher@kernel.crashing.org> | 2016-04-28 20:43:12 +0200 |
|---|---|---|
| committer | Segher Boessenkool <segher@gcc.gnu.org> | 2016-04-28 20:43:12 +0200 |
| commit | dc236a9d78d10bda700ca2997ca3134cd6e80775 (patch) | |
| tree | 213687455965e0361ac7efc243ef53f45672b17d /gcc/sbitmap.h | |
| parent | eb74cda0a5e2ab0a5a922c53113053c2e027a035 (diff) | |
| download | gcc-dc236a9d78d10bda700ca2997ca3134cd6e80775.zip gcc-dc236a9d78d10bda700ca2997ca3134cd6e80775.tar.gz gcc-dc236a9d78d10bda700ca2997ca3134cd6e80775.tar.bz2 | |
sbitmap: Remove popcount
In r193072 sbitmap_popcount was removed, so we cannot ask for the popcount
of an sbitmap anymore. Nothing calls sbitmap_alloc_with_popcount either.
This patch removes everything else popcount-related from sbitmap.
* cfganal.c (bitmap_intersection_of_succs): Delete assert checking
dst->popcount.
(bitmap_intersection_of_preds): Ditto.
(bitmap_union_of_succs): Ditto.
(bitmap_union_of_preds): Ditto.
* sbitmap.c (do_popcount): Delete.
(BITMAP_DEBUGGING): Delete.
(sbitmap_verify_popcount): Delete.
(sbitmap_alloc): Don't initialize the popcount field.
(sbitmap_alloc_with_popcount): Delete.
(sbitmap_resize): Don't resize the popcount array.
(sbitmap_vector_alloc): Don't initialize the popcount field.
(bitmap_copy): Don't copy the popcount array.
(bitmap_clear): Don't clear the popcount array.
(bitmap_clear): Delete the popcount array handling.
(bitmap_ior_and_compl): Delete the popcount assert.
(bitmap_not): Ditto.
(bitmap_and_compl): Ditto.
(bitmap_and): Delete the popcount array handling.
(bitmap_xor): Ditto.
(bitmap_ior): Ditto.
(bitmap_or_and): Delete the popcount assert.
(bitmap_and_or): Ditto.
(popcount_table): Delete.
(sbitmap_elt_popcount): Delete.
* sbitmap.h (simple_bitmap_def): Delete the popcount field.
(bitmap_set_bit): Delete the popcount assert.
(bitmap_clear_bit): Ditto.
(sbitmap_free): Don't free the popcount array.
(sbitmap_alloc_with_popcount): Delete declaration.
(sbitmap_popcount): Ditto.
From-SVN: r235592
Diffstat (limited to 'gcc/sbitmap.h')
| -rw-r--r-- | gcc/sbitmap.h | 6 |
1 files changed, 0 insertions, 6 deletions
diff --git a/gcc/sbitmap.h b/gcc/sbitmap.h index c9de88a..c208171 100644 --- a/gcc/sbitmap.h +++ b/gcc/sbitmap.h @@ -84,7 +84,6 @@ along with GCC; see the file COPYING3. If not see struct simple_bitmap_def { - unsigned char *popcount; /* Population count. */ unsigned int n_bits; /* Number of bits. */ unsigned int size; /* Size in elements. */ SBITMAP_ELT_TYPE elms[1]; /* The elements. */ @@ -110,7 +109,6 @@ bitmap_bit_p (const_sbitmap map, int bitno) static inline void bitmap_set_bit (sbitmap map, int bitno) { - gcc_checking_assert (! map->popcount); map->elms[bitno / SBITMAP_ELT_BITS] |= (SBITMAP_ELT_TYPE) 1 << (bitno) % SBITMAP_ELT_BITS; } @@ -120,7 +118,6 @@ bitmap_set_bit (sbitmap map, int bitno) static inline void bitmap_clear_bit (sbitmap map, int bitno) { - gcc_checking_assert (! map->popcount); map->elms[bitno / SBITMAP_ELT_BITS] &= ~((SBITMAP_ELT_TYPE) 1 << (bitno) % SBITMAP_ELT_BITS); } @@ -213,7 +210,6 @@ bmp_iter_next (sbitmap_iterator *i, unsigned *bit_no ATTRIBUTE_UNUSED) inline void sbitmap_free (sbitmap map) { - free (map->popcount); free (map); } @@ -231,7 +227,6 @@ extern void debug (const simple_bitmap_def *ptr); extern void dump_bitmap_vector (FILE *, const char *, const char *, sbitmap *, int); extern sbitmap sbitmap_alloc (unsigned int); -extern sbitmap sbitmap_alloc_with_popcount (unsigned int); extern sbitmap *sbitmap_vector_alloc (unsigned int, unsigned int); extern sbitmap sbitmap_resize (sbitmap, unsigned int, int); extern void bitmap_copy (sbitmap, const_sbitmap); @@ -261,5 +256,4 @@ extern int bitmap_last_set_bit (const_sbitmap); extern void debug_bitmap (const_sbitmap); extern sbitmap sbitmap_realloc (sbitmap, unsigned int); -extern unsigned long sbitmap_popcount (const_sbitmap, unsigned long); #endif /* ! GCC_SBITMAP_H */ |