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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@211936 138bc75d-0d04-0410-961f-82ee72b054a4

2 files changed, 9 insertions, 5 deletions

diff --git a/gcc/java/ChangeLog b/gcc/java/ChangeLog
index 09e7978d942..ce90e28f791 100644
--- a/gcc/java/ChangeLog
+++ b/gcc/java/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-24  Trevor Saunders  <tsaunders@mozilla.com>
+
+	* jcf-io.c: Adjust.
+
 2014-06-11  Jan Hubicka  <hubicka@ucw.cz>
 
 	* java/class.c (build_utf8_ref): Update handling for section names
diff --git a/gcc/java/jcf-io.c b/gcc/java/jcf-io.c
index 7491882254d..358fc1e47c1 100644
--- a/gcc/java/jcf-io.c
+++ b/gcc/java/jcf-io.c
@@ -299,7 +299,7 @@ charstar_hash::equal (const value_type *existing, const compare_type *candidate)
    during class lookup.  (There is no need to cache the values
    associated with names that were found; they are saved in
    IDENTIFIER_CLASS_VALUE.)  */
-static hash_table <charstar_hash> memoized_class_lookups;
+static hash_table<charstar_hash> *memoized_class_lookups;
 
 /* Returns a freshly malloc'd string with the fully qualified pathname
    of the .class file for the class CLASSNAME.  CLASSNAME must be
@@ -321,13 +321,13 @@ find_class (const char *classname, int classname_length, JCF *jcf)
   hashval_t hash;
 
   /* Create the hash table, if it does not already exist.  */
-  if (!memoized_class_lookups.is_created ())
-    memoized_class_lookups.create (37);
+  if (!memoized_class_lookups)
+    memoized_class_lookups = new hash_table<charstar_hash> (37);
 
   /* Loop for this class in the hashtable.  If it is present, we've
      already looked for this class and failed to find it.  */
   hash = charstar_hash::hash (classname);
-  if (memoized_class_lookups.find_with_hash (classname, hash))
+  if (memoized_class_lookups->find_with_hash (classname, hash))
     return NULL;
 
   /* Allocate and zero out the buffer, since we don't explicitly put a
@@ -402,7 +402,7 @@ find_class (const char *classname, int classname_length, JCF *jcf)
 
   /* Remember that this class could not be found so that we do not
      have to look again.  */
-  *memoized_class_lookups.find_slot_with_hash (classname, hash, INSERT)
+  *memoized_class_lookups->find_slot_with_hash (classname, hash, INSERT)
     = classname;
 
   return NULL;