From 9937801191a8686d18a79c105b3c3b419c51f174 Mon Sep 17 00:00:00 2001 From: rsandifo Date: Thu, 25 Jun 2015 17:05:47 +0000 Subject: [PATCH] gcc/ada/ * gcc-interface/decl.c (value_annotation_hasher::handle_cache_entry): Delete. (value_annotation_hasher::keep_cache_entry): New function. * gcc-interface/utils.c (pad_type_hasher::handle_cache_entry): Delete. (pad_type_hasher::keep_cache_entry): New function. gcc/ * hash-table.h (hash_table): Add gt_cleare_cache as a friend. (gt_cleare_cache): Check here for deleted and empty entries. Replace handle_cache_entry with a call to keep_cache_entry. * hash-traits.h (ggc_cache_hasher::handle_cache_entry): Delete. (ggc_cache_hasher::keep_cache_entry): New function. * trans-mem.c (tm_wrapper_hasher::handle_cache_entry): Delete. (tm_wrapper_hasher::keep_cache_entry): New function. * tree.h (tree_decl_map_cache_hasher::handle_cache_entry): Delete. (tree_vec_map_cache_hasher::keep_cache_entry): New function. * tree.c (type_cache_hasher::handle_cache_entry): Delete. (type_cache_hasher::keep_cache_entry): New function. (tree_vec_map_cache_hasher::handle_cache_entry): Delete. (tree_vec_map_cache_hasher::keep_cache_entry): New function. * ubsan.c (tree_type_map_cache_hasher::handle_cache_entry): Delete. (tree_type_map_cache_hasher::keep_cache_entry): New function. * varasm.c (tm_clone_hasher::handle_cache_entry): Delete. (tm_clone_hasher::keep_cache_entry): New function. * config/i386/i386.c (dllimport_hasher::handle_cache_entry): Delete. (dllimport_hasher::keep_cache_entry): New function. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@224954 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/ChangeLog | 22 ++++++++++++++++++++++ gcc/ada/ChangeLog | 9 +++++++++ gcc/ada/gcc-interface/decl.c | 12 +++--------- gcc/ada/gcc-interface/utils.c | 14 ++++---------- gcc/config/i386/i386.c | 12 +++--------- gcc/hash-table.h | 26 +++++++++++++++++++++++--- gcc/hash-traits.h | 9 +++------ gcc/trans-mem.c | 16 +++++----------- gcc/tree.c | 26 +++++++------------------- gcc/tree.h | 12 +++--------- gcc/ubsan.c | 12 +++--------- gcc/varasm.c | 12 +++--------- 12 files changed, 88 insertions(+), 94 deletions(-) diff --git a/gcc/ChangeLog b/gcc/ChangeLog index 2045dc7..71bb2af 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,27 @@ 2015-06-25 Richard Sandiford + * hash-table.h (hash_table): Add gt_cleare_cache as a friend. + (gt_cleare_cache): Check here for deleted and empty entries. + Replace handle_cache_entry with a call to keep_cache_entry. + * hash-traits.h (ggc_cache_hasher::handle_cache_entry): Delete. + (ggc_cache_hasher::keep_cache_entry): New function. + * trans-mem.c (tm_wrapper_hasher::handle_cache_entry): Delete. + (tm_wrapper_hasher::keep_cache_entry): New function. + * tree.h (tree_decl_map_cache_hasher::handle_cache_entry): Delete. + (tree_vec_map_cache_hasher::keep_cache_entry): New function. + * tree.c (type_cache_hasher::handle_cache_entry): Delete. + (type_cache_hasher::keep_cache_entry): New function. + (tree_vec_map_cache_hasher::handle_cache_entry): Delete. + (tree_vec_map_cache_hasher::keep_cache_entry): New function. + * ubsan.c (tree_type_map_cache_hasher::handle_cache_entry): Delete. + (tree_type_map_cache_hasher::keep_cache_entry): New function. + * varasm.c (tm_clone_hasher::handle_cache_entry): Delete. + (tm_clone_hasher::keep_cache_entry): New function. + * config/i386/i386.c (dllimport_hasher::handle_cache_entry): Delete. + (dllimport_hasher::keep_cache_entry): New function. + +2015-06-25 Richard Sandiford + * hash-table.h: Include hash-traits.h. (typed_free_remove, typed_noop_remove, pointer_hash, ggc_hasher) (ggc_cache_hasher): Move to... diff --git a/gcc/ada/ChangeLog b/gcc/ada/ChangeLog index 09d1ef9..e4fc125 100644 --- a/gcc/ada/ChangeLog +++ b/gcc/ada/ChangeLog @@ -1,3 +1,12 @@ +2015-06-25 Richard Sandiford + + * gcc-interface/decl.c (value_annotation_hasher::handle_cache_entry): + Delete. + (value_annotation_hasher::keep_cache_entry): New function. + * gcc-interface/utils.c (pad_type_hasher::handle_cache_entry): + Delete. + (pad_type_hasher::keep_cache_entry): New function. + 2015-06-25 Andrew MacLeod * gcc-interface/misc.c: Include calls.h not function.h. diff --git a/gcc/ada/gcc-interface/decl.c b/gcc/ada/gcc-interface/decl.c index af2d11e..7511c56 100644 --- a/gcc/ada/gcc-interface/decl.c +++ b/gcc/ada/gcc-interface/decl.c @@ -148,16 +148,10 @@ struct value_annotation_hasher : ggc_cache_hasher return a->base.from == b->base.from; } - static void - handle_cache_entry (tree_int_map *&m) + static int + keep_cache_entry (tree_int_map *&m) { - extern void gt_ggc_mx (tree_int_map *&); - if (m == HTAB_EMPTY_ENTRY || m == HTAB_DELETED_ENTRY) - return; - else if (ggc_marked_p (m->base.from)) - gt_ggc_mx (m); - else - m = static_cast (HTAB_DELETED_ENTRY); + return ggc_marked_p (m->base.from); } }; diff --git a/gcc/ada/gcc-interface/utils.c b/gcc/ada/gcc-interface/utils.c index fbdf473..6044600 100644 --- a/gcc/ada/gcc-interface/utils.c +++ b/gcc/ada/gcc-interface/utils.c @@ -241,7 +241,7 @@ struct pad_type_hasher : ggc_cache_hasher { static inline hashval_t hash (pad_type_hash *t) { return t->hash; } static bool equal (pad_type_hash *a, pad_type_hash *b); - static void handle_cache_entry (pad_type_hash *&); + static int keep_cache_entry (pad_type_hash *&); }; static GTY ((cache)) @@ -1168,16 +1168,10 @@ make_type_from_size (tree type, tree size_tree, bool for_biased) /* See if the data pointed to by the hash table slot is marked. */ -void -pad_type_hasher::handle_cache_entry (pad_type_hash *&t) +int +pad_type_hasher::keep_cache_entry (pad_type_hash *&t) { - extern void gt_ggc_mx (pad_type_hash *&); - if (t == HTAB_EMPTY_ENTRY || t == HTAB_DELETED_ENTRY) - return; - else if (ggc_marked_p (t->type)) - gt_ggc_mx (t); - else - t = static_cast (HTAB_DELETED_ENTRY); + return ggc_marked_p (t->type); } /* Return true iff the padded types are equivalent. */ diff --git a/gcc/config/i386/i386.c b/gcc/config/i386/i386.c index 2df91c4..a05f226 100644 --- a/gcc/config/i386/i386.c +++ b/gcc/config/i386/i386.c @@ -14221,16 +14221,10 @@ struct dllimport_hasher : ggc_cache_hasher return a->base.from == b->base.from; } - static void - handle_cache_entry (tree_map *&m) + static int + keep_cache_entry (tree_map *&m) { - extern void gt_ggc_mx (tree_map *&); - if (m == HTAB_EMPTY_ENTRY || m == HTAB_DELETED_ENTRY) - return; - else if (ggc_marked_p (m->base.from)) - gt_ggc_mx (m); - else - m = static_cast (HTAB_DELETED_ENTRY); + return ggc_marked_p (m->base.from); } }; diff --git a/gcc/hash-table.h b/gcc/hash-table.h index 71c0f63..d0d93a3 100644 --- a/gcc/hash-table.h +++ b/gcc/hash-table.h @@ -52,6 +52,16 @@ along with GCC; see the file COPYING3. If not see individual elements of the table need to be disposed of (e.g., when deleting a hash table, removing elements from the table, etc). + - An optional static function named 'keep_cache_entry'. This + function is provided only for garbage-collected elements that + are not marked by the normal gc mark pass. It describes what + what should happen to the element at the end of the gc mark phase. + The return value should be: + - 0 if the element should be deleted + - 1 if the element should be kept and needs to be marked + - -1 if the element should be kept and is already marked. + Returning -1 rather than 1 is purely an optimization. + 3. The type of the hash table itself. (More later.) In very special circumstances, users may need to know about a fourth type. @@ -584,6 +594,8 @@ private: template friend void gt_pch_nx (hash_table *, gt_pointer_operator, void *); + template friend void gt_cleare_cache (hash_table *); + value_type *alloc_entries (size_t n CXX_MEM_STAT_INFO) const; value_type *find_empty_slot_for_expand (hashval_t); void expand (); @@ -1131,12 +1143,20 @@ template inline void gt_cleare_cache (hash_table *h) { + extern void gt_ggc_mx (typename H::value_type &t); + typedef hash_table table; if (!h) return; - for (typename hash_table::iterator iter = h->begin (); iter != h->end (); - ++iter) - H::handle_cache_entry (*iter); + for (typename table::iterator iter = h->begin (); iter != h->end (); ++iter) + if (!table::is_empty (*iter) && !table::is_deleted (*iter)) + { + int res = H::keep_cache_entry (*iter); + if (res == 0) + h->clear_slot (&*iter); + else if (res != -1) + gt_ggc_mx (*iter); + } } #endif /* TYPED_HASHTAB_H */ diff --git a/gcc/hash-traits.h b/gcc/hash-traits.h index 1bac581..3cc6a6f 100644 --- a/gcc/hash-traits.h +++ b/gcc/hash-traits.h @@ -146,13 +146,10 @@ struct ggc_cache_hasher op (&p, cookie); } - /* Clear out entries if they are about to be gc'd. */ - - static void - handle_cache_entry (T &e) + static int + keep_cache_entry (T &e) { - if (e != HTAB_EMPTY_ENTRY && e != HTAB_DELETED_ENTRY && !ggc_marked_p (e)) - e = static_cast (HTAB_DELETED_ENTRY); + return ggc_marked_p (e) ? -1 : 0; } }; diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c index 29e5628..ded1e51 100644 --- a/gcc/trans-mem.c +++ b/gcc/trans-mem.c @@ -480,17 +480,11 @@ struct tm_wrapper_hasher : ggc_cache_hasher return a->base.from == b->base.from; } - static void - handle_cache_entry (tree_map *&m) - { - extern void gt_ggc_mx (tree_map *&); - if (m == HTAB_EMPTY_ENTRY || m == HTAB_DELETED_ENTRY) - return; - else if (ggc_marked_p (m->base.from)) - gt_ggc_mx (m); - else - m = static_cast (HTAB_DELETED_ENTRY); - } + static int + keep_cache_entry (tree_map *&m) + { + return ggc_marked_p (m->base.from); + } }; static GTY((cache)) hash_table *tm_wrap_map; diff --git a/gcc/tree.c b/gcc/tree.c index d44bc18..2511246 100644 --- a/gcc/tree.c +++ b/gcc/tree.c @@ -201,16 +201,10 @@ struct type_cache_hasher : ggc_cache_hasher static hashval_t hash (type_hash *t) { return t->hash; } static bool equal (type_hash *a, type_hash *b); - static void - handle_cache_entry (type_hash *&t) + static int + keep_cache_entry (type_hash *&t) { - extern void gt_ggc_mx (type_hash *&); - if (t == HTAB_DELETED_ENTRY || t == HTAB_EMPTY_ENTRY) - return; - else if (ggc_marked_p (t->type)) - gt_ggc_mx (t); - else - t = static_cast (HTAB_DELETED_ENTRY); + return ggc_marked_p (t->type); } }; @@ -259,7 +253,7 @@ static GTY ((cache)) static GTY ((cache)) hash_table *value_expr_for_decl; - struct tree_vec_map_cache_hasher : ggc_cache_hasher +struct tree_vec_map_cache_hasher : ggc_cache_hasher { static hashval_t hash (tree_vec_map *m) { return DECL_UID (m->base.from); } @@ -269,16 +263,10 @@ static GTY ((cache)) return a->base.from == b->base.from; } - static void - handle_cache_entry (tree_vec_map *&m) + static int + keep_cache_entry (tree_vec_map *&m) { - extern void gt_ggc_mx (tree_vec_map *&); - if (m == HTAB_EMPTY_ENTRY || m == HTAB_DELETED_ENTRY) - return; - else if (ggc_marked_p (m->base.from)) - gt_ggc_mx (m); - else - m = static_cast (HTAB_DELETED_ENTRY); + return ggc_marked_p (m->base.from); } }; diff --git a/gcc/tree.h b/gcc/tree.h index e9f0d73..51465e2 100644 --- a/gcc/tree.h +++ b/gcc/tree.h @@ -4635,16 +4635,10 @@ struct tree_decl_map_cache_hasher : ggc_cache_hasher return tree_decl_map_eq (a, b); } - static void - handle_cache_entry (tree_decl_map *&m) + static int + keep_cache_entry (tree_decl_map *&m) { - extern void gt_ggc_mx (tree_decl_map *&); - if (m == HTAB_EMPTY_ENTRY || m == HTAB_DELETED_ENTRY) - return; - else if (ggc_marked_p (m->base.from)) - gt_ggc_mx (m); - else - m = static_cast (HTAB_DELETED_ENTRY); + return ggc_marked_p (m->base.from); } }; diff --git a/gcc/ubsan.c b/gcc/ubsan.c index 3809728..14e54ef 100644 --- a/gcc/ubsan.c +++ b/gcc/ubsan.c @@ -97,16 +97,10 @@ struct tree_type_map_cache_hasher : ggc_cache_hasher return a->type.from == b->type.from; } - static void - handle_cache_entry (tree_type_map *&m) + static int + keep_cache_entry (tree_type_map *&m) { - extern void gt_ggc_mx (tree_type_map *&); - if (m == HTAB_EMPTY_ENTRY || m == HTAB_DELETED_ENTRY) - return; - else if (ggc_marked_p (m->type.from)) - gt_ggc_mx (m); - else - m = static_cast (HTAB_DELETED_ENTRY); + return ggc_marked_p (m->type.from); } }; diff --git a/gcc/varasm.c b/gcc/varasm.c index 056d8c7..8b4385b 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -5795,16 +5795,10 @@ struct tm_clone_hasher : ggc_cache_hasher static hashval_t hash (tree_map *m) { return tree_map_hash (m); } static bool equal (tree_map *a, tree_map *b) { return tree_map_eq (a, b); } - static void - handle_cache_entry (tree_map *&e) + static int + keep_cache_entry (tree_map *&e) { - extern void gt_ggc_mx (tree_map *&); - if (e == HTAB_EMPTY_ENTRY || e == HTAB_DELETED_ENTRY) - return; - else if (ggc_marked_p (e->base.from)) - gt_ggc_mx (e); - else - e = static_cast (HTAB_DELETED_ENTRY); + return ggc_marked_p (e->base.from); } }; -- 2.7.4