diff options
author | Trevor Saunders <tsaunders@mozilla.com> | 2014-10-12 22:22:53 +0000 |
---|---|---|
committer | Trevor Saunders <tbsaunde@gcc.gnu.org> | 2014-10-12 22:22:53 +0000 |
commit | 2a22f99cb12d82712dd93cfef808b1cef543601b (patch) | |
tree | c828063f153ceb609ce5c7d44ea9f00391b32950 /gcc/cp/mangle.c | |
parent | 7b262a51ea2310bdb6cc901de00f04b0e7be0a4e (diff) | |
download | gcc-2a22f99cb12d82712dd93cfef808b1cef543601b.zip gcc-2a22f99cb12d82712dd93cfef808b1cef543601b.tar.gz gcc-2a22f99cb12d82712dd93cfef808b1cef543601b.tar.bz2 |
move many gc hashtab to hash_table
gcc/
* asan.c, cfgloop.c, cfgloop.h, cgraph.c, cgraph.h,
config/darwin.c, config/m32c/m32c.c, config/mep/mep.c,
config/mips/mips.c, config/rs6000/rs6000.c, dwarf2out.c,
function.c, function.h, gimple-ssa.h, libfuncs.h, optabs.c,
output.h, rtl.h, sese.c, symtab.c, tree-cfg.c, tree-dfa.c,
tree-ssa.c, varasm.c: Use hash-table instead of hashtab.
* doc/gty.texi (for_user): Document new option.
* gengtype.c (create_user_defined_type): Don't try to get a struct for
char.
(walk_type): Don't error out on for_user option.
(write_func_for_structure): Emit user marking routines if requested by
for_user option.
(write_local_func_for_structure): Likewise.
(main): Mark types with for_user option as used.
* ggc.h (gt_pch_nx): Add overload for unsigned int.
* hash-map.h (hash_map::hash_entry::pch_nx_helper): AddOverloads.
* hash-table.h (ggc_hasher): New struct.
(hash_table::create_ggc): New function.
(gt_pch_nx): New overload for hash_table.
java/
* class.c, decl.c, except.c, expr.c, java-tree.h, lang.c: Use
hash_table instead of hashtab.
objc/
* objc-act.c: use hash_table instead of hashtab.
cp/
* cp-gimplify.c, cp-tree.h, decl.c, mangle.c, name-lookup.c,
pt.c, semantics.c, tree.c, typeck2.c: Use hash_table instead of
hashtab.
fortran/
* trans-decl.c, trans.c, trans.h: Use hash_table instead of hashtab.
c-family/
* c-common.c: Use hash_table instead of hashtab.
From-SVN: r216127
Diffstat (limited to 'gcc/cp/mangle.c')
-rw-r--r-- | gcc/cp/mangle.c | 35 |
1 files changed, 21 insertions, 14 deletions
diff --git a/gcc/cp/mangle.c b/gcc/cp/mangle.c index 6e6aa8a..6b8f706 100644 --- a/gcc/cp/mangle.c +++ b/gcc/cp/mangle.c @@ -49,6 +49,7 @@ along with GCC; see the file COPYING3. If not see #include "coretypes.h" #include "tm.h" #include "tree.h" +#include "tree-hasher.h" #include "stor-layout.h" #include "stringpool.h" #include "tm_p.h" @@ -3690,26 +3691,32 @@ mangle_thunk (tree fn_decl, const int this_adjusting, tree fixed_offset, return result; } +struct conv_type_hasher : ggc_hasher<tree> +{ + static hashval_t hash (tree); + static bool equal (tree, tree); +}; + /* This hash table maps TYPEs to the IDENTIFIER for a conversion operator to TYPE. The nodes are IDENTIFIERs whose TREE_TYPE is the TYPE. */ -static GTY ((param_is (union tree_node))) htab_t conv_type_names; +static GTY (()) hash_table<conv_type_hasher> *conv_type_names; /* Hash a node (VAL1) in the table. */ -static hashval_t -hash_type (const void *val) +hashval_t +conv_type_hasher::hash (tree val) { - return (hashval_t) TYPE_UID (TREE_TYPE ((const_tree) val)); + return (hashval_t) TYPE_UID (TREE_TYPE (val)); } /* Compare VAL1 (a node in the table) with VAL2 (a TYPE). */ -static int -compare_type (const void *val1, const void *val2) +bool +conv_type_hasher::equal (tree val1, tree val2) { - return TREE_TYPE ((const_tree) val1) == (const_tree) val2; + return TREE_TYPE (val1) == val2; } /* Return an identifier for the mangled unqualified name for a @@ -3719,25 +3726,25 @@ compare_type (const void *val1, const void *val2) tree mangle_conv_op_name_for_type (const tree type) { - void **slot; + tree *slot; tree identifier; if (type == error_mark_node) return error_mark_node; if (conv_type_names == NULL) - conv_type_names = htab_create_ggc (31, &hash_type, &compare_type, NULL); + conv_type_names = hash_table<conv_type_hasher>::create_ggc (31); - slot = htab_find_slot_with_hash (conv_type_names, type, - (hashval_t) TYPE_UID (type), INSERT); - identifier = (tree)*slot; + slot = conv_type_names->find_slot_with_hash (type, + (hashval_t) TYPE_UID (type), + INSERT); + identifier = *slot; if (!identifier) { char buffer[64]; /* Create a unique name corresponding to TYPE. */ - sprintf (buffer, "operator %lu", - (unsigned long) htab_elements (conv_type_names)); + sprintf (buffer, "operator %lu", conv_type_names->elements ()); identifier = get_identifier (buffer); *slot = identifier; |