diff options
author | Trevor Saunders <tsaunders@mozilla.com> | 2014-06-24 13:21:35 +0000 |
---|---|---|
committer | Trevor Saunders <tbsaunde@gcc.gnu.org> | 2014-06-24 13:21:35 +0000 |
commit | c203e8a73b2f12a1da52a16a0c4a50e62b42445b (patch) | |
tree | b8d7f5b21a14b16949ddbc5dcaeb5f2b2654d63a /gcc/cselib.c | |
parent | fbc2a724d481bb5c205baeaaa955533451226d01 (diff) | |
download | gcc-c203e8a73b2f12a1da52a16a0c4a50e62b42445b.zip gcc-c203e8a73b2f12a1da52a16a0c4a50e62b42445b.tar.gz gcc-c203e8a73b2f12a1da52a16a0c4a50e62b42445b.tar.bz2 |
Remove a layer of indirection from hash_table
gcc/
* hash-table.h: Remove a layer of indirection from hash_table so that
it contains the hash table's data instead of a pointer to the data.
* alloc-pool.c, asan.c, attribs.c, bitmap.c, cfg.c,
config/arm/arm.c, config/i386/winnt.c, config/ia64/ia64.c,
config/mips/mips.c, config/sol2.c, coverage.c, cselib.c,
data-streamer-out.c, dse.c, dwarf2cfi.c, dwarf2out.c, except.c,
fold-const.c, gcse.c, ggc-common.c,
gimple-ssa-strength-reduction.c, gimplify.c,
graphite-clast-to-gimple.c, graphite-dependences.c,
graphite-htab.h, graphite.c, haifa-sched.c, ipa-devirt.c,
ipa-profile.c, ira-color.c, ira-costs.c, loop-invariant.c,
loop-iv.c, loop-unroll.c, lto-streamer-in.c, lto-streamer-out.c,
lto-streamer.c, lto-streamer.h, passes.c, plugin.c,
postreload-gcse.c, sese.c, statistics.c, store-motion.c,
trans-mem.c, tree-browser.c, tree-cfg.c, tree-complex.c,
tree-eh.c, tree-into-ssa.c, tree-parloops.c, tree-sra.c,
tree-ssa-ccp.c, tree-ssa-coalesce.c, tree-ssa-dom.c,
tree-ssa-live.c, tree-ssa-loop-im.c,
tree-ssa-loop-ivopts.c, tree-ssa-phiopt.c, tree-ssa-pre.c,
tree-ssa-reassoc.c, tree-ssa-sccvn.c, tree-ssa-strlen.c,
tree-ssa-structalias.c, tree-ssa-tail-merge.c,
tree-ssa-threadupdate.c, tree-ssa-uncprop.c,
tree-vect-data-refs.c, tree-vect-loop.c, tree-vectorizer.c,
tree-vectorizer.h, valtrack.c, valtrack.h, var-tracking.c,
vtable-verify.c, vtable-verify.h: Adjust.
gcc/c/
* c-decl.c: Adjust.
gcc/cp/
* class.c, semantics.c, tree.c, vtable-class-hierarchy.c:
Adjust.
gcc/java/
* jcf-io.c: Adjust.
gcc/lto/
* lto.c: Adjust.
gcc/objc/
* objc-act.c: Adjust.
From-SVN: r211936
Diffstat (limited to 'gcc/cselib.c')
-rw-r--r-- | gcc/cselib.c | 41 |
1 files changed, 22 insertions, 19 deletions
diff --git a/gcc/cselib.c b/gcc/cselib.c index 00a04ba..d069f10 100644 --- a/gcc/cselib.c +++ b/gcc/cselib.c @@ -145,10 +145,10 @@ cselib_hasher::equal (const value_type *v, const compare_type *x_arg) } /* A table that enables us to look up elts by their value. */ -static hash_table <cselib_hasher> cselib_hash_table; +static hash_table<cselib_hasher> *cselib_hash_table; /* A table to hold preserved values. */ -static hash_table <cselib_hasher> cselib_preserved_hash_table; +static hash_table<cselib_hasher> *cselib_preserved_hash_table; /* This is a global so we don't have to pass this through every function. It is used in new_elt_loc_list to set SETTING_INSN. */ @@ -499,13 +499,13 @@ preserve_constants_and_equivs (cselib_val **x, void *info ATTRIBUTE_UNUSED) GET_MODE (v->val_rtx), v->val_rtx, VOIDmode }; cselib_val **slot - = cselib_preserved_hash_table.find_slot_with_hash (&lookup, + = cselib_preserved_hash_table->find_slot_with_hash (&lookup, v->hash, INSERT); gcc_assert (!*slot); *slot = v; } - cselib_hash_table.clear_slot (x); + cselib_hash_table->clear_slot (x); return 1; } @@ -546,10 +546,11 @@ cselib_reset_table (unsigned int num) } if (cselib_preserve_constants) - cselib_hash_table.traverse <void *, preserve_constants_and_equivs> (NULL); + cselib_hash_table->traverse <void *, preserve_constants_and_equivs> + (NULL); else { - cselib_hash_table.empty (); + cselib_hash_table->empty (); gcc_checking_assert (!cselib_any_perm_equivs); } @@ -581,10 +582,10 @@ cselib_find_slot (enum machine_mode mode, rtx x, hashval_t hash, cselib_val **slot = NULL; cselib_hasher::compare_type lookup = { mode, x, memmode }; if (cselib_preserve_constants) - slot = cselib_preserved_hash_table.find_slot_with_hash (&lookup, hash, - NO_INSERT); + slot = cselib_preserved_hash_table->find_slot_with_hash (&lookup, hash, + NO_INSERT); if (!slot) - slot = cselib_hash_table.find_slot_with_hash (&lookup, hash, insert); + slot = cselib_hash_table->find_slot_with_hash (&lookup, hash, insert); return slot; } @@ -662,7 +663,7 @@ discard_useless_values (cselib_val **x, void *info ATTRIBUTE_UNUSED) cselib_discard_hook (v); CSELIB_VAL_PTR (v->val_rtx) = NULL; - cselib_hash_table.clear_slot (x); + cselib_hash_table->clear_slot (x); unchain_one_value (v); n_useless_values--; } @@ -683,7 +684,7 @@ remove_useless_values (void) do { values_became_useless = 0; - cselib_hash_table.traverse <void *, discard_useless_locs> (NULL); + cselib_hash_table->traverse <void *, discard_useless_locs> (NULL); } while (values_became_useless); @@ -702,7 +703,7 @@ remove_useless_values (void) n_debug_values -= n_useless_debug_values; n_useless_debug_values = 0; - cselib_hash_table.traverse <void *, discard_useless_values> (NULL); + cselib_hash_table->traverse <void *, discard_useless_values> (NULL); gcc_assert (!n_useless_values); } @@ -2703,7 +2704,7 @@ cselib_process_insn (rtx insn) quadratic behavior for very large hashtables with very few useless elements. */ && ((unsigned int)n_useless_values - > (cselib_hash_table.elements () - n_debug_values) / 4)) + > (cselib_hash_table->elements () - n_debug_values) / 4)) remove_useless_values (); } @@ -2744,9 +2745,9 @@ cselib_init (int record_what) } used_regs = XNEWVEC (unsigned int, cselib_nregs); n_used_regs = 0; - cselib_hash_table.create (31); + cselib_hash_table = new hash_table<cselib_hasher> (31); if (cselib_preserve_constants) - cselib_preserved_hash_table.create (31); + cselib_preserved_hash_table = new hash_table<cselib_hasher> (31); next_uid = 1; } @@ -2766,9 +2767,11 @@ cselib_finish (void) free_alloc_pool (cselib_val_pool); free_alloc_pool (value_pool); cselib_clear_table (); - cselib_hash_table.dispose (); + delete cselib_hash_table; + cselib_hash_table = NULL; if (preserved) - cselib_preserved_hash_table.dispose (); + delete cselib_preserved_hash_table; + cselib_preserved_hash_table = NULL; free (used_regs); used_regs = 0; n_useless_values = 0; @@ -2857,9 +2860,9 @@ void dump_cselib_table (FILE *out) { fprintf (out, "cselib hash table:\n"); - cselib_hash_table.traverse <FILE *, dump_cselib_val> (out); + cselib_hash_table->traverse <FILE *, dump_cselib_val> (out); fprintf (out, "cselib preserved hash table:\n"); - cselib_preserved_hash_table.traverse <FILE *, dump_cselib_val> (out); + cselib_preserved_hash_table->traverse <FILE *, dump_cselib_val> (out); if (first_containing_mem != &dummy_val) { fputs ("first mem ", out); |