diff options
| -rw-r--r-- | gcc/ChangeLog | 27 | ||||
| -rw-r--r-- | gcc/c-family/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/c-family/c-common.c | 2 | ||||
| -rw-r--r-- | gcc/cfgloop.h | 2 | ||||
| -rw-r--r-- | gcc/cgraph.c | 2 | ||||
| -rw-r--r-- | gcc/cgraph.h | 6 | ||||
| -rw-r--r-- | gcc/config/darwin.c | 4 | ||||
| -rw-r--r-- | gcc/config/rs6000/rs6000.c | 4 | ||||
| -rw-r--r-- | gcc/cp/ChangeLog | 12 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 4 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 4 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 | ||||
| -rw-r--r-- | gcc/cp/mangle.c | 2 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 2 | ||||
| -rw-r--r-- | gcc/cp/tree.c | 4 | ||||
| -rw-r--r-- | gcc/cp/typeck2.c | 2 | ||||
| -rw-r--r-- | gcc/dwarf2out.c | 14 | ||||
| -rw-r--r-- | gcc/fortran/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/fortran/trans-decl.c | 2 | ||||
| -rw-r--r-- | gcc/fortran/trans.h | 2 | ||||
| -rw-r--r-- | gcc/function.c | 2 | ||||
| -rw-r--r-- | gcc/function.h | 2 | ||||
| -rw-r--r-- | gcc/gimple-ssa.h | 4 | ||||
| -rw-r--r-- | gcc/hash-table.h | 9 | ||||
| -rw-r--r-- | gcc/hash-traits.h | 18 | ||||
| -rw-r--r-- | gcc/java/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/java/java-tree.h | 6 | ||||
| -rw-r--r-- | gcc/libfuncs.h | 2 | ||||
| -rw-r--r-- | gcc/lto-streamer.h | 2 | ||||
| -rw-r--r-- | gcc/objc/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/objc/objc-act.c | 2 | ||||
| -rw-r--r-- | gcc/optabs.c | 2 | ||||
| -rw-r--r-- | gcc/tree-scalar-evolution.c | 2 | ||||
| -rw-r--r-- | gcc/varasm.c | 6 |
34 files changed, 123 insertions, 52 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index b3d064e..9737e4a 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,5 +1,32 @@ 2015-06-25 Richard Sandiford <richard.sandiford@arm.com> + * hash-traits.h (ggc_hasher): Rename to... + (ggc_remover): ...this and remove typedefs. + (ggc_cache_hasher): Update accordingly. Add typedefs. + (ggc_ptr_hash): New class. + * hash-table.h: Update comment. + * cfgloop.h (loop_exit_hasher): Inherit from ggc_ptr_hash rather than + ggc_hasher. + * cgraph.h (section_name_hasher, cgraph_edge_hasher): Likewise. + (tree_descriptor_hasher): Likewise. + * cgraph.c (function_version_hasher): Likewise. + * dwarf2out.c (indirect_string_hasher, dwarf_file_hasher): Likewise. + (decl_die_hasher, block_die_hasher, decl_loc_hasher): Likewise. + (dw_loc_list_hasher, addr_hasher): Likewise. + * function.h (used_type_hasher): Likewise. + * function.c (temp_address_hasher): Likewise. + * gimple-ssa.h (tm_restart_hasher, ssa_name_hasher): Likewise. + * libfuncs.h (libfunc_hasher): Likewise. + * lto-streamer.h (decl_state_hasher): Likewise. + * optabs.c (libfunc_decl_hasher): Likewise. + * tree-scalar-evolution.c (scev_info_hasher): Likewise. + * varasm.c (section_hasher, object_block_hasher): Likewise. + (const_rtx_desc_hasher): Likewise. + * config/darwin.c (indirection_hasher, cfstring_hasher): Likewise. + * config/rs6000/rs6000.c (toc_hasher, builtin_hasher): Likewise. + +2015-06-25 Richard Sandiford <richard.sandiford@arm.com> + * hash-traits.h (free_ptr_hash): New class. * dwarf2out.c (decl_table_entry_hasher): Inherit from free_ptr_hash rather than typed_free_remove. Remove redudant typedefs. diff --git a/gcc/c-family/ChangeLog b/gcc/c-family/ChangeLog index 61afc6a..780d916b 100644 --- a/gcc/c-family/ChangeLog +++ b/gcc/c-family/ChangeLog @@ -1,3 +1,8 @@ +2015-06-25 Richard Sandiford <richard.sandiford@arm.com> + + * c-common.c (c_type_hasher): Inherit from ggc_ptr_hash rather than + ggc_hasher. + 2015-06-25 Andrew MacLeod <amacleod@redhat.com> * cilk.c: Move calls.h after tm.h in the include chain. diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c index 5ceee5f..1802630 100644 --- a/gcc/c-family/c-common.c +++ b/gcc/c-family/c-common.c @@ -5089,7 +5089,7 @@ c_apply_type_quals_to_decl (int type_quals, tree decl) } } -struct c_type_hasher : ggc_hasher<tree> +struct c_type_hasher : ggc_ptr_hash<tree_node> { static hashval_t hash (tree); static bool equal (tree, tree); diff --git a/gcc/cfgloop.h b/gcc/cfgloop.h index 29b626a..fe3bb92 100644 --- a/gcc/cfgloop.h +++ b/gcc/cfgloop.h @@ -85,7 +85,7 @@ struct GTY ((for_user)) loop_exit { struct loop_exit *next_e; }; -struct loop_exit_hasher : ggc_hasher<loop_exit *> +struct loop_exit_hasher : ggc_ptr_hash<loop_exit> { typedef edge compare_type; diff --git a/gcc/cgraph.c b/gcc/cgraph.c index 60f9006..698f56e 100644 --- a/gcc/cgraph.c +++ b/gcc/cgraph.c @@ -126,7 +126,7 @@ struct cgraph_2node_hook_list { /* Hash descriptor for cgraph_function_version_info. */ -struct function_version_hasher : ggc_hasher<cgraph_function_version_info *> +struct function_version_hasher : ggc_ptr_hash<cgraph_function_version_info> { static hashval_t hash (cgraph_function_version_info *); static bool equal (cgraph_function_version_info *, diff --git a/gcc/cgraph.h b/gcc/cgraph.h index 62d4ad6..d4cb94d 100644 --- a/gcc/cgraph.h +++ b/gcc/cgraph.h @@ -44,7 +44,7 @@ struct GTY((for_user)) section_hash_entry_d typedef struct section_hash_entry_d section_hash_entry; -struct section_name_hasher : ggc_hasher<section_hash_entry *> +struct section_name_hasher : ggc_ptr_hash<section_hash_entry> { typedef const char *compare_type; @@ -769,7 +769,7 @@ enum cgraph_inline_failed_type_t struct cgraph_edge; -struct cgraph_edge_hasher : ggc_hasher<cgraph_edge *> +struct cgraph_edge_hasher : ggc_ptr_hash<cgraph_edge> { typedef gimple compare_type; @@ -2801,7 +2801,7 @@ varpool_node::all_refs_explicit_p () && !force_output); } -struct tree_descriptor_hasher : ggc_hasher<constant_descriptor_tree *> +struct tree_descriptor_hasher : ggc_ptr_hash<constant_descriptor_tree> { static hashval_t hash (constant_descriptor_tree *); static bool equal (constant_descriptor_tree *, constant_descriptor_tree *); diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c index 3627ba6..93c6d67 100644 --- a/gcc/config/darwin.c +++ b/gcc/config/darwin.c @@ -477,7 +477,7 @@ typedef struct GTY ((for_user)) machopic_indirection bool used; } machopic_indirection; -struct indirection_hasher : ggc_hasher<machopic_indirection *> +struct indirection_hasher : ggc_ptr_hash<machopic_indirection> { typedef const char *compare_type; static hashval_t hash (machopic_indirection *); @@ -3271,7 +3271,7 @@ typedef struct GTY ((for_user)) cfstring_descriptor { tree constructor; } cfstring_descriptor; -struct cfstring_hasher : ggc_hasher<cfstring_descriptor *> +struct cfstring_hasher : ggc_ptr_hash<cfstring_descriptor> { static hashval_t hash (cfstring_descriptor *); static bool equal (cfstring_descriptor *, cfstring_descriptor *); diff --git a/gcc/config/rs6000/rs6000.c b/gcc/config/rs6000/rs6000.c index 56acc86..38442ec 100644 --- a/gcc/config/rs6000/rs6000.c +++ b/gcc/config/rs6000/rs6000.c @@ -1228,7 +1228,7 @@ struct GTY((for_user)) toc_hash_struct int labelno; }; -struct toc_hasher : ggc_hasher<toc_hash_struct *> +struct toc_hasher : ggc_ptr_hash<toc_hash_struct> { static hashval_t hash (toc_hash_struct *); static bool equal (toc_hash_struct *, toc_hash_struct *); @@ -1245,7 +1245,7 @@ struct GTY((for_user)) builtin_hash_struct unsigned char uns_p[4]; /* and whether the types are unsigned. */ }; -struct builtin_hasher : ggc_hasher<builtin_hash_struct *> +struct builtin_hasher : ggc_ptr_hash<builtin_hash_struct> { static hashval_t hash (builtin_hash_struct *); static bool equal (builtin_hash_struct *, builtin_hash_struct *); diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6bc2962..338e21e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,17 @@ 2015-06-25 Richard Sandiford <richard.sandiford@arm.com> + * constexpr.c (constexpr_fundef_hasher): Inherit from ggc_ptr_hash + rather than ggc_hasher. + (constexpr_call_hasher): Likewise. + * cp-tree.h (cxx_int_tree_map_hasher, named_label_hasher): Likewise. + * decl.c (typename_hasher): Likewise. + * mangle.c (conv_type_hasher): Likewise. + * pt.c (spec_hasher): Likewise. + * tree.c (cplus_array_hasher, list_hasher): Likewise. + * typeck2.c (abstract_type_hasher): Likewise. + +2015-06-25 Richard Sandiford <richard.sandiford@arm.com> + * class.c (fixed_type_or_null_ref_ht): Inherit from nofree_ptr_hash rather than pointer_hash. (fixed_type_or_null): Use nofree_ptr_hash instead of pointer_hash. diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index f6e2bc8..9cb45ea 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -123,7 +123,7 @@ struct GTY((for_user)) constexpr_fundef { tree body; }; -struct constexpr_fundef_hasher : ggc_hasher<constexpr_fundef *> +struct constexpr_fundef_hasher : ggc_ptr_hash<constexpr_fundef> { static hashval_t hash (constexpr_fundef *); static bool equal (constexpr_fundef *, constexpr_fundef *); @@ -872,7 +872,7 @@ struct GTY((for_user)) constexpr_call { hashval_t hash; }; -struct constexpr_call_hasher : ggc_hasher<constexpr_call *> +struct constexpr_call_hasher : ggc_ptr_hash<constexpr_call> { static hashval_t hash (constexpr_call *); static bool equal (constexpr_call *, constexpr_call *); diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index b53aa90..e8cc38f 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -1181,7 +1181,7 @@ struct GTY((for_user)) cxx_int_tree_map { tree to; }; -struct cxx_int_tree_map_hasher : ggc_hasher<cxx_int_tree_map *> +struct cxx_int_tree_map_hasher : ggc_ptr_hash<cxx_int_tree_map> { static hashval_t hash (cxx_int_tree_map *); static bool equal (cxx_int_tree_map *, cxx_int_tree_map *); @@ -1189,7 +1189,7 @@ struct cxx_int_tree_map_hasher : ggc_hasher<cxx_int_tree_map *> struct named_label_entry; -struct named_label_hasher : ggc_hasher<named_label_entry *> +struct named_label_hasher : ggc_ptr_hash<named_label_entry> { static hashval_t hash (named_label_entry *); static bool equal (named_label_entry *, named_label_entry *); diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 8f0bb34..545f4cd 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -3331,7 +3331,7 @@ struct typename_info { bool class_p; }; -struct typename_hasher : ggc_hasher<tree> +struct typename_hasher : ggc_ptr_hash<tree_node> { typedef typename_info *compare_type; diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 69ecb67..2fdc4b2 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -3841,7 +3841,7 @@ mangle_thunk (tree fn_decl, const int this_adjusting, tree fixed_offset, return result; } -struct conv_type_hasher : ggc_hasher<tree> +struct conv_type_hasher : ggc_ptr_hash<tree_node> { static hashval_t hash (tree); static bool equal (tree, tree); diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index b63c0d4..fe5fc14 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -89,7 +89,7 @@ struct GTY((for_user)) spec_entry tree spec; }; -struct spec_hasher : ggc_hasher<spec_entry *> +struct spec_hasher : ggc_ptr_hash<spec_entry> { static hashval_t hash (spec_entry *); static bool equal (spec_entry *, spec_entry *); diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 3ee2f34..f373ddd 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -734,7 +734,7 @@ struct cplus_array_info tree domain; }; -struct cplus_array_hasher : ggc_hasher<tree> +struct cplus_array_hasher : ggc_ptr_hash<tree_node> { typedef cplus_array_info *compare_type; @@ -1712,7 +1712,7 @@ struct list_proxy tree chain; }; -struct list_hasher : ggc_hasher<tree> +struct list_hasher : ggc_ptr_hash<tree_node> { typedef list_proxy *compare_type; diff --git a/gcc/cp/typeck2.c b/gcc/cp/typeck2.c index 6c3aa4c..30d93ed 100644 --- a/gcc/cp/typeck2.c +++ b/gcc/cp/typeck2.c @@ -156,7 +156,7 @@ struct GTY((chain_next ("%h.next"), for_user)) pending_abstract_type { struct pending_abstract_type* next; }; -struct abstract_type_hasher : ggc_hasher<pending_abstract_type *> +struct abstract_type_hasher : ggc_ptr_hash<pending_abstract_type> { typedef tree compare_type; static hashval_t hash (pending_abstract_type *); diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 4b89d3e..0f08daa 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -220,7 +220,7 @@ struct GTY((for_user)) indirect_string_node { unsigned int index; }; -struct indirect_string_hasher : ggc_hasher<indirect_string_node *> +struct indirect_string_hasher : ggc_ptr_hash<indirect_string_node> { typedef const char *compare_type; @@ -2796,7 +2796,7 @@ static GTY(()) limbo_die_node *limbo_die_list; DW_AT_{,MIPS_}linkage_name once their DECL_ASSEMBLER_NAMEs are set. */ static GTY(()) limbo_die_node *deferred_asm_name; -struct dwarf_file_hasher : ggc_hasher<dwarf_file_data *> +struct dwarf_file_hasher : ggc_ptr_hash<dwarf_file_data> { typedef const char *compare_type; @@ -2807,7 +2807,7 @@ struct dwarf_file_hasher : ggc_hasher<dwarf_file_data *> /* Filenames referenced by this compilation unit. */ static GTY(()) hash_table<dwarf_file_hasher> *file_table; -struct decl_die_hasher : ggc_hasher<die_node *> +struct decl_die_hasher : ggc_ptr_hash<die_node> { typedef tree compare_type; @@ -2818,7 +2818,7 @@ struct decl_die_hasher : ggc_hasher<die_node *> The key is a DECL_UID() which is a unique number identifying each decl. */ static GTY (()) hash_table<decl_die_hasher> *decl_die_table; -struct block_die_hasher : ggc_hasher<die_struct *> +struct block_die_hasher : ggc_ptr_hash<die_struct> { static hashval_t hash (die_struct *); static bool equal (die_struct *, die_struct *); @@ -2882,7 +2882,7 @@ struct GTY ((chain_next ("%h.next"))) call_arg_loc_node { }; -struct decl_loc_hasher : ggc_hasher<var_loc_list *> +struct decl_loc_hasher : ggc_ptr_hash<var_loc_list> { typedef const_tree compare_type; @@ -2912,7 +2912,7 @@ struct GTY ((for_user)) cached_dw_loc_list_def { }; typedef struct cached_dw_loc_list_def cached_dw_loc_list; -struct dw_loc_list_hasher : ggc_hasher<cached_dw_loc_list *> +struct dw_loc_list_hasher : ggc_ptr_hash<cached_dw_loc_list> { typedef const_tree compare_type; @@ -4238,7 +4238,7 @@ AT_loc_list_ptr (dw_attr_ref a) return &a->dw_attr_val.v.val_loc_list; } -struct addr_hasher : ggc_hasher<addr_table_entry *> +struct addr_hasher : ggc_ptr_hash<addr_table_entry> { static hashval_t hash (addr_table_entry *); static bool equal (addr_table_entry *, addr_table_entry *); diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 52f24b2..42a3064 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,8 @@ +2015-06-25 Richard Sandiford <richard.sandiford@arm.com> + + * trans-decl.c (module_hasher): Likewise. + * trans.h (module_decl_hasher): Likewise. + 2015-06-24 Manuel López-Ibáñez <manu@gcc.gnu.org> PR fortran/66528 diff --git a/gcc/fortran/trans-decl.c b/gcc/fortran/trans-decl.c index 1eed32d..09cdcd0 100644 --- a/gcc/fortran/trans-decl.c +++ b/gcc/fortran/trans-decl.c @@ -4360,7 +4360,7 @@ gfc_trans_deferred_vars (gfc_symbol * proc_sym, gfc_wrapped_block * block) gfc_add_init_cleanup (block, gfc_finish_block (&tmpblock), NULL_TREE); } -struct module_hasher : ggc_hasher<module_htab_entry *> +struct module_hasher : ggc_ptr_hash<module_htab_entry> { typedef const char *compare_type; diff --git a/gcc/fortran/trans.h b/gcc/fortran/trans.h index 570b5b8..e618088 100644 --- a/gcc/fortran/trans.h +++ b/gcc/fortran/trans.h @@ -598,7 +598,7 @@ void gfc_generate_module_vars (gfc_namespace *); /* Get the appropriate return statement for a procedure. */ tree gfc_generate_return (void); -struct module_decl_hasher : ggc_hasher<tree_node *> +struct module_decl_hasher : ggc_ptr_hash<tree_node> { typedef const char *compare_type; diff --git a/gcc/function.c b/gcc/function.c index e746b3f..f6b7d30 100644 --- a/gcc/function.c +++ b/gcc/function.c @@ -574,7 +574,7 @@ struct GTY((for_user)) temp_slot_address_entry { struct temp_slot *temp_slot; }; -struct temp_address_hasher : ggc_hasher<temp_slot_address_entry *> +struct temp_address_hasher : ggc_ptr_hash<temp_slot_address_entry> { static hashval_t hash (temp_slot_address_entry *); static bool equal (temp_slot_address_entry *, temp_slot_address_entry *); diff --git a/gcc/function.h b/gcc/function.h index f9b2468..e286188 100644 --- a/gcc/function.h +++ b/gcc/function.h @@ -415,7 +415,7 @@ struct GTY((for_user)) types_used_by_vars_entry { tree var_decl; }; -struct used_type_hasher : ggc_hasher<types_used_by_vars_entry *> +struct used_type_hasher : ggc_ptr_hash<types_used_by_vars_entry> { static hashval_t hash (types_used_by_vars_entry *); static bool equal (types_used_by_vars_entry *, types_used_by_vars_entry *); diff --git a/gcc/gimple-ssa.h b/gcc/gimple-ssa.h index 2bfcc03..25dde08 100644 --- a/gcc/gimple-ssa.h +++ b/gcc/gimple-ssa.h @@ -34,7 +34,7 @@ struct GTY((for_user)) tm_restart_node { /* Hasher for tm_restart_node. */ -struct tm_restart_hasher : ggc_hasher<tm_restart_node *> +struct tm_restart_hasher : ggc_ptr_hash<tm_restart_node> { static hashval_t hash (tm_restart_node *n) { return htab_hash_pointer (n); } @@ -45,7 +45,7 @@ struct tm_restart_hasher : ggc_hasher<tm_restart_node *> } }; -struct ssa_name_hasher : ggc_hasher<tree> +struct ssa_name_hasher : ggc_ptr_hash<tree_node> { /* Hash a tree in a uid_decl_map. */ diff --git a/gcc/hash-table.h b/gcc/hash-table.h index 31440f6..3f49345 100644 --- a/gcc/hash-table.h +++ b/gcc/hash-table.h @@ -91,8 +91,8 @@ along with GCC; see the file COPYING3. If not see We compose this into a few steps. 1. Decide on a removal policy for values stored in the table. - hash-traits.h provides class templates for the two most common - policies. + hash-traits.h provides class templates for the three most common + policies: * typed_free_remove implements the static 'remove' member function by calling free(). @@ -100,6 +100,11 @@ along with GCC; see the file COPYING3. If not see * typed_noop_remove implements the static 'remove' member function by doing nothing. + * ggc_remove implements the static 'remove' member by doing nothing, + but instead provides routines for gc marking and for PCH streaming. + Use this for garbage-collected data that needs to be preserved across + collections. + You can use these policies by simply deriving the descriptor type from one of those class template, with the appropriate argument. diff --git a/gcc/hash-traits.h b/gcc/hash-traits.h index e4c182e..77f88f3 100644 --- a/gcc/hash-traits.h +++ b/gcc/hash-traits.h @@ -121,14 +121,11 @@ pointer_hash <Type>::is_empty (Type *e) return e == NULL; } -/* Hasher for entry in gc memory. */ +/* Remover and marker for entries in gc memory. */ template<typename T> -struct ggc_hasher +struct ggc_remove { - typedef T value_type; - typedef T compare_type; - static void remove (T &) {} static void @@ -155,8 +152,11 @@ struct ggc_hasher /* Hasher for cache entry in gc memory. */ template<typename T> -struct ggc_cache_hasher : ggc_hasher<T> +struct ggc_cache_hasher : ggc_remove<T> { + typedef T value_type; + typedef T compare_type; + /* Entries are weakly held because this is for caches. */ static void ggc_mx (T &) {} @@ -179,4 +179,10 @@ struct nofree_ptr_hash : pointer_hash <T>, typed_noop_remove <T> {}; template <typename T> struct free_ptr_hash : pointer_hash <T>, typed_free_remove <T> {}; +/* Traits for elements that point to gc memory. The pointed-to data + must be kept across collections. */ + +template <typename T> +struct ggc_ptr_hash : pointer_hash <T>, ggc_remove <T *> {}; + #endif diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog index edc2c55..6a93304 100644 --- a/gcc/java/ChangeLog +++ b/gcc/java/ChangeLog @@ -1,5 +1,11 @@ 2015-06-25 Richard Sandiford <richard.sandiford@arm.com> + * java-tree.h (treetreehasher): Inherit from ggc_ptr_hash + rather than ggc_hasher. + (ict_hasher, type_assertion_hasher): Likewise. + +2015-06-25 Richard Sandiford <richard.sandiford@arm.com> + * jcf-io.c (charstar_hash): Inherit from nofree_ptr_hash rather than typed_noop_remove. Remove redudant typedefs. diff --git a/gcc/java/java-tree.h b/gcc/java/java-tree.h index 7c9a519..c299119 100644 --- a/gcc/java/java-tree.h +++ b/gcc/java/java-tree.h @@ -714,7 +714,7 @@ struct GTY((for_user)) treetreehash_entry { tree value; }; -struct treetreehasher : ggc_hasher<treetreehash_entry *> +struct treetreehasher : ggc_ptr_hash<treetreehash_entry> { typedef tree compare_type; @@ -722,7 +722,7 @@ struct treetreehasher : ggc_hasher<treetreehash_entry *> static bool equal (treetreehash_entry *, tree); }; -struct ict_hasher : ggc_hasher<tree_node *> +struct ict_hasher : ggc_ptr_hash<tree_node> { static hashval_t hash (tree t) { return htab_hash_pointer (t); } static bool equal (tree a, tree b) { return a == b; } @@ -797,7 +797,7 @@ typedef struct GTY((for_user)) type_assertion { tree op2; /* Second operand. */ } type_assertion; -struct type_assertion_hasher : ggc_hasher<type_assertion *> +struct type_assertion_hasher : ggc_ptr_hash<type_assertion> { static hashval_t hash (type_assertion *); static bool equal (type_assertion *, type_assertion *); diff --git a/gcc/libfuncs.h b/gcc/libfuncs.h index a2e8414..22e6973 100644 --- a/gcc/libfuncs.h +++ b/gcc/libfuncs.h @@ -61,7 +61,7 @@ struct GTY((for_user)) libfunc_entry { /* Descriptor for libfunc_entry. */ -struct libfunc_hasher : ggc_hasher<libfunc_entry *> +struct libfunc_hasher : ggc_ptr_hash<libfunc_entry> { static hashval_t hash (libfunc_entry *); static bool equal (libfunc_entry *, libfunc_entry *); diff --git a/gcc/lto-streamer.h b/gcc/lto-streamer.h index 1463dd9..d5a330d 100644 --- a/gcc/lto-streamer.h +++ b/gcc/lto-streamer.h @@ -508,7 +508,7 @@ struct GTY((for_user)) lto_in_decl_state typedef struct lto_in_decl_state *lto_in_decl_state_ptr; -struct decl_state_hasher : ggc_hasher<lto_in_decl_state *> +struct decl_state_hasher : ggc_ptr_hash<lto_in_decl_state> { static hashval_t hash (lto_in_decl_state *s) diff --git a/gcc/objc/ChangeLog b/gcc/objc/ChangeLog index 5d618ab..24fd40f 100644 --- a/gcc/objc/ChangeLog +++ b/gcc/objc/ChangeLog @@ -1,5 +1,10 @@ 2015-06-25 Richard Sandiford <richard.sandiford@arm.com> + * objc-act.c (objc_string_hasher): Inherit from ggc_ptr_hash + rather than ggc_hasher. + +2015-06-25 Richard Sandiford <richard.sandiford@arm.com> + * objc-act.c (decl_name_hash): Inherit from nofree_ptr_hash rather than typed_noop_remove. Remove redudant typedefs. diff --git a/gcc/objc/objc-act.c b/gcc/objc/objc-act.c index 53e50e5..db77260 100644 --- a/gcc/objc/objc-act.c +++ b/gcc/objc/objc-act.c @@ -265,7 +265,7 @@ struct GTY((for_user)) string_descriptor { tree constructor; }; -struct objc_string_hasher : ggc_hasher<string_descriptor *> +struct objc_string_hasher : ggc_ptr_hash<string_descriptor> { static hashval_t hash (string_descriptor *); static bool equal (string_descriptor *, string_descriptor *); diff --git a/gcc/optabs.c b/gcc/optabs.c index 491341b..8377c22 100644 --- a/gcc/optabs.c +++ b/gcc/optabs.c @@ -6051,7 +6051,7 @@ gen_satfractuns_conv_libfunc (convert_optab tab, /* Hashtable callbacks for libfunc_decls. */ -struct libfunc_decl_hasher : ggc_hasher<tree> +struct libfunc_decl_hasher : ggc_ptr_hash<tree_node> { static hashval_t hash (tree entry) diff --git a/gcc/tree-scalar-evolution.c b/gcc/tree-scalar-evolution.c index 1abefea..676fbe8 100644 --- a/gcc/tree-scalar-evolution.c +++ b/gcc/tree-scalar-evolution.c @@ -339,7 +339,7 @@ tree chrec_dont_know; happen, then it qualifies it with chrec_known. */ tree chrec_known; -struct scev_info_hasher : ggc_hasher<scev_info_str *> +struct scev_info_hasher : ggc_ptr_hash<scev_info_str> { static hashval_t hash (scev_info_str *i); static bool equal (const scev_info_str *a, const scev_info_str *b); diff --git a/gcc/varasm.c b/gcc/varasm.c index 8b4385b..0f87228 100644 --- a/gcc/varasm.c +++ b/gcc/varasm.c @@ -188,7 +188,7 @@ static GTY(()) section *unnamed_sections; ((TREE_CODE (DECL) == FUNCTION_DECL || TREE_CODE (DECL) == VAR_DECL) \ && DECL_SECTION_NAME (DECL) != NULL) -struct section_hasher : ggc_hasher<section *> +struct section_hasher : ggc_ptr_hash<section> { typedef const char *compare_type; @@ -199,7 +199,7 @@ struct section_hasher : ggc_hasher<section *> /* Hash table of named sections. */ static GTY(()) hash_table<section_hasher> *section_htab; -struct object_block_hasher : ggc_hasher<object_block *> +struct object_block_hasher : ggc_ptr_hash<object_block> { typedef const section *compare_type; @@ -3539,7 +3539,7 @@ struct GTY((chain_next ("%h.next"), for_user)) constant_descriptor_rtx { int mark; }; -struct const_rtx_desc_hasher : ggc_hasher<constant_descriptor_rtx *> +struct const_rtx_desc_hasher : ggc_ptr_hash<constant_descriptor_rtx> { static hashval_t hash (constant_descriptor_rtx *); static bool equal (constant_descriptor_rtx *, constant_descriptor_rtx *); |