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: https://gcc.gnu.org/svn/gcc/trunk@211936 138bc75d-0d04-0410-961f-82ee72b054a4

1 files changed, 59 insertions, 67 deletions

diff --git a/gcc/tree-parloops.c b/gcc/tree-parloops.c
index 3bc6a2bbf23..3ef4aa632e0 100644
--- a/gcc/tree-parloops.c
+++ b/gcc/tree-parloops.c
@@ -227,20 +227,20 @@ reduction_hasher::hash (const value_type *a)
   return a->reduc_version;
 }
 
-typedef hash_table <reduction_hasher> reduction_info_table_type;
+typedef hash_table<reduction_hasher> reduction_info_table_type;
 
 
 static struct reduction_info *
-reduction_phi (reduction_info_table_type reduction_list, gimple phi)
+reduction_phi (reduction_info_table_type *reduction_list, gimple phi)
 {
   struct reduction_info tmpred, *red;
 
-  if (reduction_list.elements () == 0 || phi == NULL)
+  if (reduction_list->elements () == 0 || phi == NULL)
     return NULL;
 
   tmpred.reduc_phi = phi;
   tmpred.reduc_version = gimple_uid (phi);
-  red = reduction_list.find (&tmpred);
+  red = reduction_list->find (&tmpred);
 
   return red;
 }
@@ -279,7 +279,7 @@ name_to_copy_hasher::hash (const value_type *a)
   return (hashval_t) a->version;
 }
 
-typedef hash_table <name_to_copy_hasher> name_to_copy_table_type;
+typedef hash_table<name_to_copy_hasher> name_to_copy_table_type;
 
 /* A transformation matrix, which is a self-contained ROWSIZE x COLSIZE
    matrix.  Rather than use floats, we simply keep a single DENOMINATOR that
@@ -486,7 +486,7 @@ loop_has_blocks_with_irreducible_flag (struct loop *loop)
 
 static tree
 take_address_of (tree obj, tree type, edge entry,
-		 int_tree_htab_type decl_address, gimple_stmt_iterator *gsi)
+		 int_tree_htab_type *decl_address, gimple_stmt_iterator *gsi)
 {
   int uid;
   int_tree_map **dslot;
@@ -512,7 +512,7 @@ take_address_of (tree obj, tree type, edge entry,
      on it.  */
   uid = DECL_UID (TREE_OPERAND (TREE_OPERAND (*var_p, 0), 0));
   ielt.uid = uid;
-  dslot = decl_address.find_slot_with_hash (&ielt, uid, INSERT);
+  dslot = decl_address->find_slot_with_hash (&ielt, uid, INSERT);
   if (!*dslot)
     {
       if (gsi == NULL)
@@ -609,7 +609,7 @@ struct elv_data
 {
   struct walk_stmt_info info;
   edge entry;
-  int_tree_htab_type decl_address;
+  int_tree_htab_type *decl_address;
   gimple_stmt_iterator *gsi;
   bool changed;
   bool reset;
@@ -699,7 +699,7 @@ eliminate_local_variables_1 (tree *tp, int *walk_subtrees, void *data)
 
 static void
 eliminate_local_variables_stmt (edge entry, gimple_stmt_iterator *gsi,
-				int_tree_htab_type decl_address)
+				int_tree_htab_type *decl_address)
 {
   struct elv_data dta;
   gimple stmt = gsi_stmt (*gsi);
@@ -756,8 +756,7 @@ eliminate_local_variables (edge entry, edge exit)
   unsigned i;
   gimple_stmt_iterator gsi;
   bool has_debug_stmt = false;
-  int_tree_htab_type decl_address;
-  decl_address.create (10);
+  int_tree_htab_type decl_address (10);
   basic_block entry_bb = entry->src;
   basic_block exit_bb = exit->dest;
 
@@ -772,16 +771,14 @@ eliminate_local_variables (edge entry, edge exit)
 	      has_debug_stmt = true;
 	  }
 	else
-	  eliminate_local_variables_stmt (entry, &gsi, decl_address);
+	  eliminate_local_variables_stmt (entry, &gsi, &decl_address);
 
   if (has_debug_stmt)
     FOR_EACH_VEC_ELT (body, i, bb)
       if (bb != entry_bb && bb != exit_bb)
 	for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
 	  if (gimple_debug_bind_p (gsi_stmt (gsi)))
-	    eliminate_local_variables_stmt (entry, &gsi, decl_address);
-
-  decl_address.dispose ();
+	    eliminate_local_variables_stmt (entry, &gsi, &decl_address);
 }
 
 /* Returns true if expression EXPR is not defined between ENTRY and
@@ -819,8 +816,9 @@ expr_invariant_in_region_p (edge entry, edge exit, tree expr)
    duplicated, storing the copies in DECL_COPIES.  */
 
 static tree
-separate_decls_in_region_name (tree name, name_to_copy_table_type name_copies,
-			       int_tree_htab_type decl_copies, bool copy_name_p)
+separate_decls_in_region_name (tree name, name_to_copy_table_type *name_copies,
+			       int_tree_htab_type *decl_copies,
+			       bool copy_name_p)
 {
   tree copy, var, var_copy;
   unsigned idx, uid, nuid;
@@ -834,8 +832,8 @@ separate_decls_in_region_name (tree name, name_to_copy_table_type name_copies,
 
   idx = SSA_NAME_VERSION (name);
   elt.version = idx;
-  slot = name_copies.find_slot_with_hash (&elt, idx,
-					  copy_name_p ? INSERT : NO_INSERT);
+  slot = name_copies->find_slot_with_hash (&elt, idx,
+					   copy_name_p ? INSERT : NO_INSERT);
   if (slot && *slot)
     return (*slot)->new_name;
 
@@ -860,7 +858,7 @@ separate_decls_in_region_name (tree name, name_to_copy_table_type name_copies,
 
   uid = DECL_UID (var);
   ielt.uid = uid;
-  dslot = decl_copies.find_slot_with_hash (&ielt, uid, INSERT);
+  dslot = decl_copies->find_slot_with_hash (&ielt, uid, INSERT);
   if (!*dslot)
     {
       var_copy = create_tmp_var (TREE_TYPE (var), get_name (var));
@@ -874,7 +872,7 @@ separate_decls_in_region_name (tree name, name_to_copy_table_type name_copies,
          it again.  */
       nuid = DECL_UID (var_copy);
       ielt.uid = nuid;
-      dslot = decl_copies.find_slot_with_hash (&ielt, nuid, INSERT);
+      dslot = decl_copies->find_slot_with_hash (&ielt, nuid, INSERT);
       gcc_assert (!*dslot);
       nielt = XNEW (struct int_tree_map);
       nielt->uid = nuid;
@@ -897,8 +895,8 @@ separate_decls_in_region_name (tree name, name_to_copy_table_type name_copies,
 
 static void
 separate_decls_in_region_stmt (edge entry, edge exit, gimple stmt,
-			       name_to_copy_table_type name_copies,
-			       int_tree_htab_type decl_copies)
+			       name_to_copy_table_type *name_copies,
+			       int_tree_htab_type *decl_copies)
 {
   use_operand_p use;
   def_operand_p def;
@@ -937,8 +935,8 @@ separate_decls_in_region_stmt (edge entry, edge exit, gimple stmt,
 
 static bool
 separate_decls_in_region_debug (gimple stmt,
-				name_to_copy_table_type name_copies,
-				int_tree_htab_type decl_copies)
+				name_to_copy_table_type *name_copies,
+				int_tree_htab_type *decl_copies)
 {
   use_operand_p use;
   ssa_op_iter oi;
@@ -958,7 +956,7 @@ separate_decls_in_region_debug (gimple stmt,
     return true;
   gcc_assert (DECL_P (var) && SSA_VAR_P (var));
   ielt.uid = DECL_UID (var);
-  dslot = decl_copies.find_slot_with_hash (&ielt, ielt.uid, NO_INSERT);
+  dslot = decl_copies->find_slot_with_hash (&ielt, ielt.uid, NO_INSERT);
   if (!dslot)
     return true;
   if (gimple_debug_bind_p (stmt))
@@ -973,7 +971,7 @@ separate_decls_in_region_debug (gimple stmt,
       continue;
 
     elt.version = SSA_NAME_VERSION (name);
-    slot = name_copies.find_slot_with_hash (&elt, elt.version, NO_INSERT);
+    slot = name_copies->find_slot_with_hash (&elt, elt.version, NO_INSERT);
     if (!slot)
       {
 	gimple_debug_bind_reset_value (stmt);
@@ -1133,14 +1131,14 @@ create_call_for_reduction_1 (reduction_info **slot, struct clsn_data *clsn_data)
    shared data is stored in and loaded from.  */
 static void
 create_call_for_reduction (struct loop *loop,
-			   reduction_info_table_type reduction_list,
+			   reduction_info_table_type *reduction_list,
 			   struct clsn_data *ld_st_data)
 {
-  reduction_list.traverse <struct loop *, create_phi_for_local_result> (loop);
+  reduction_list->traverse <struct loop *, create_phi_for_local_result> (loop);
   /* Find the fallthru edge from GIMPLE_OMP_CONTINUE.  */
   ld_st_data->load_bb = FALLTHRU_EDGE (loop->latch)->dest;
   reduction_list
-    .traverse <struct clsn_data *, create_call_for_reduction_1> (ld_st_data);
+    ->traverse <struct clsn_data *, create_call_for_reduction_1> (ld_st_data);
 }
 
 /* Callback for htab_traverse.  Loads the final reduction value at the
@@ -1182,7 +1180,7 @@ create_loads_for_reductions (reduction_info **slot, struct clsn_data *clsn_data)
    REDUCTION_LIST describes the list of reductions that the
    loads should be generated for.  */
 static void
-create_final_loads_for_reduction (reduction_info_table_type reduction_list,
+create_final_loads_for_reduction (reduction_info_table_type *reduction_list,
 				  struct clsn_data *ld_st_data)
 {
   gimple_stmt_iterator gsi;
@@ -1196,7 +1194,7 @@ create_final_loads_for_reduction (reduction_info_table_type reduction_list,
   gsi_insert_before (&gsi, stmt, GSI_NEW_STMT);
 
   reduction_list
-    .traverse <struct clsn_data *, create_loads_for_reductions> (ld_st_data);
+    ->traverse <struct clsn_data *, create_loads_for_reductions> (ld_st_data);
 
 }
 
@@ -1288,17 +1286,15 @@ create_loads_and_stores_for_name (name_to_copy_elt **slot,
 
 static void
 separate_decls_in_region (edge entry, edge exit,
-			  reduction_info_table_type reduction_list,
+			  reduction_info_table_type *reduction_list,
 			  tree *arg_struct, tree *new_arg_struct,
 			  struct clsn_data *ld_st_data)
 
 {
   basic_block bb1 = split_edge (entry);
   basic_block bb0 = single_pred (bb1);
-  name_to_copy_table_type name_copies;
-  name_copies.create (10);
-  int_tree_htab_type decl_copies;
-  decl_copies.create (10);
+  name_to_copy_table_type name_copies (10);
+  int_tree_htab_type decl_copies (10);
   unsigned i;
   tree type, type_name, nvar;
   gimple_stmt_iterator gsi;
@@ -1318,7 +1314,7 @@ separate_decls_in_region (edge entry, edge exit,
 	{
 	  for (gsi = gsi_start_phis (bb); !gsi_end_p (gsi); gsi_next (&gsi))
 	    separate_decls_in_region_stmt (entry, exit, gsi_stmt (gsi),
-					   name_copies, decl_copies);
+					   &name_copies, &decl_copies);
 
 	  for (gsi = gsi_start_bb (bb); !gsi_end_p (gsi); gsi_next (&gsi))
 	    {
@@ -1328,7 +1324,7 @@ separate_decls_in_region (edge entry, edge exit,
 		has_debug_stmt = true;
 	      else
 		separate_decls_in_region_stmt (entry, exit, stmt,
-					       name_copies, decl_copies);
+					       &name_copies, &decl_copies);
 	    }
 	}
     }
@@ -1349,8 +1345,8 @@ separate_decls_in_region (edge entry, edge exit,
 
 	      if (is_gimple_debug (stmt))
 		{
-		  if (separate_decls_in_region_debug (stmt, name_copies,
-						      decl_copies))
+		  if (separate_decls_in_region_debug (stmt, &name_copies,
+						      &decl_copies))
 		    {
 		      gsi_remove (&gsi, true);
 		      continue;
@@ -1361,7 +1357,7 @@ separate_decls_in_region (edge entry, edge exit,
 	    }
 	}
 
-  if (name_copies.elements () == 0 && reduction_list.elements () == 0)
+  if (name_copies.elements () == 0 && reduction_list->elements () == 0)
     {
       /* It may happen that there is nothing to copy (if there are only
          loop carried and external variables in the loop).  */
@@ -1378,10 +1374,10 @@ separate_decls_in_region (edge entry, edge exit,
       TYPE_NAME (type) = type_name;
 
       name_copies.traverse <tree, add_field_for_name> (type);
-      if (reduction_list.is_created () && reduction_list.elements () > 0)
+      if (reduction_list && reduction_list->elements () > 0)
 	{
 	  /* Create the fields for reductions.  */
-	  reduction_list.traverse <tree, add_field_for_reduction> (type);
+	  reduction_list->traverse <tree, add_field_for_reduction> (type);
 	}
       layout_type (type);
 
@@ -1401,20 +1397,17 @@ separate_decls_in_region (edge entry, edge exit,
 
       /* Load the calculation from memory (after the join of the threads).  */
 
-      if (reduction_list.is_created () && reduction_list.elements () > 0)
+      if (reduction_list && reduction_list->elements () > 0)
 	{
 	  reduction_list
-	    .traverse <struct clsn_data *, create_stores_for_reduction>
-		      (ld_st_data);
+	    ->traverse <struct clsn_data *, create_stores_for_reduction>
+	    (ld_st_data);
 	  clsn_data.load = make_ssa_name (nvar, NULL);
 	  clsn_data.load_bb = exit->dest;
 	  clsn_data.store = ld_st_data->store;
 	  create_final_loads_for_reduction (reduction_list, &clsn_data);
 	}
     }
-
-  decl_copies.dispose ();
-  name_copies.dispose ();
 }
 
 /* Bitmap containing uids of functions created by parallelization.  We cannot
@@ -1504,7 +1497,7 @@ create_loop_fn (location_t loc)
 
 static void
 transform_to_exit_first_loop (struct loop *loop,
-			      reduction_info_table_type reduction_list,
+			      reduction_info_table_type *reduction_list,
 			      tree nit)
 {
   basic_block *bbs, *nbbs, ex_bb, orig_header;
@@ -1574,7 +1567,7 @@ transform_to_exit_first_loop (struct loop *loop,
          PHI_RESULT of this phi is the resulting value of the reduction
          variable when exiting the loop.  */
 
-      if (reduction_list.elements () > 0)
+      if (reduction_list->elements () > 0)
 	{
 	  struct reduction_info *red;
 
@@ -1749,7 +1742,8 @@ create_parallel_loop (struct loop *loop, tree loop_fn, tree data,
    REDUCTION_LIST describes the reductions existent in the LOOP.  */
 
 static void
-gen_parallel_loop (struct loop *loop, reduction_info_table_type reduction_list,
+gen_parallel_loop (struct loop *loop,
+		   reduction_info_table_type *reduction_list,
 		   unsigned n_threads, struct tree_niter_desc *niter)
 {
   tree many_iterations_cond, type, nit;
@@ -1874,8 +1868,8 @@ gen_parallel_loop (struct loop *loop, reduction_info_table_type reduction_list,
   transform_to_exit_first_loop (loop, reduction_list, nit);
 
   /* Generate initializations for reductions.  */
-  if (reduction_list.elements () > 0)
-    reduction_list.traverse <struct loop *, initialize_reductions> (loop);
+  if (reduction_list->elements () > 0)
+    reduction_list->traverse <struct loop *, initialize_reductions> (loop);
 
   /* Eliminate the references to local variables from the loop.  */
   gcc_assert (single_exit (loop));
@@ -1895,7 +1889,7 @@ gen_parallel_loop (struct loop *loop, reduction_info_table_type reduction_list,
     loc = gimple_location (cond_stmt);
   parallel_head = create_parallel_loop (loop, create_loop_fn (loc), arg_struct,
 					new_arg_struct, n_threads, loc);
-  if (reduction_list.elements () > 0)
+  if (reduction_list->elements () > 0)
     create_call_for_reduction (loop, reduction_list, &clsn_data);
 
   scev_reset ();
@@ -1942,7 +1936,7 @@ loop_has_vector_phi_nodes (struct loop *loop ATTRIBUTE_UNUSED)
    and PHI, insert it to the REDUCTION_LIST.  */
 
 static void
-build_new_reduction (reduction_info_table_type reduction_list,
+build_new_reduction (reduction_info_table_type *reduction_list,
 		     gimple reduc_stmt, gimple phi)
 {
   reduction_info **slot;
@@ -1964,7 +1958,7 @@ build_new_reduction (reduction_info_table_type reduction_list,
   new_reduction->reduc_phi = phi;
   new_reduction->reduc_version = SSA_NAME_VERSION (gimple_phi_result (phi));
   new_reduction->reduction_code = gimple_assign_rhs_code (reduc_stmt);
-  slot = reduction_list.find_slot (new_reduction, INSERT);
+  slot = reduction_list->find_slot (new_reduction, INSERT);
   *slot = new_reduction;
 }
 
@@ -1981,7 +1975,7 @@ set_reduc_phi_uids (reduction_info **slot, void *data ATTRIBUTE_UNUSED)
 /* Detect all reductions in the LOOP, insert them into REDUCTION_LIST.  */
 
 static void
-gather_scalar_reductions (loop_p loop, reduction_info_table_type reduction_list)
+gather_scalar_reductions (loop_p loop, reduction_info_table_type *reduction_list)
 {
   gimple_stmt_iterator gsi;
   loop_vec_info simple_loop_info;
@@ -2013,7 +2007,7 @@ gather_scalar_reductions (loop_p loop, reduction_info_table_type reduction_list)
   /* As gimple_uid is used by the vectorizer in between vect_analyze_loop_form
      and destroy_loop_vec_info, we can set gimple_uid of reduc_phi stmts
      only now.  */
-  reduction_list.traverse <void *, set_reduc_phi_uids> (NULL);
+  reduction_list->traverse <void *, set_reduc_phi_uids> (NULL);
 }
 
 /* Try to initialize NITER for code generation part.  */
@@ -2043,7 +2037,7 @@ try_get_loop_niter (loop_p loop, struct tree_niter_desc *niter)
 
 static bool
 try_create_reduction_list (loop_p loop,
-			   reduction_info_table_type reduction_list)
+			   reduction_info_table_type *reduction_list)
 {
   edge exit = single_dom_exit (loop);
   gimple_stmt_iterator gsi;
@@ -2074,7 +2068,7 @@ try_create_reduction_list (loop_p loop,
 	      fprintf (dump_file,
 		       "  checking if it a part of reduction pattern:  \n");
 	    }
-	  if (reduction_list.elements () == 0)
+	  if (reduction_list->elements () == 0)
 	    {
 	      if (dump_file && (dump_flags & TDF_DETAILS))
 		fprintf (dump_file,
@@ -2147,7 +2141,6 @@ parallelize_loops (void)
   bool changed = false;
   struct loop *loop;
   struct tree_niter_desc niter_desc;
-  reduction_info_table_type reduction_list;
   struct obstack parloop_obstack;
   HOST_WIDE_INT estimated;
   source_location loop_loc;
@@ -2159,7 +2152,7 @@ parallelize_loops (void)
     return false;
 
   gcc_obstack_init (&parloop_obstack);
-  reduction_list.create (10);
+  reduction_info_table_type reduction_list (10);
   init_stmt_vec_info_vec ();
 
   FOR_EACH_LOOP (loop, 0)
@@ -2215,7 +2208,7 @@ parallelize_loops (void)
       if (!try_get_loop_niter (loop, &niter_desc))
 	continue;
 
-      if (!try_create_reduction_list (loop, reduction_list))
+      if (!try_create_reduction_list (loop, &reduction_list))
 	continue;
 
       if (!flag_loop_parallelize_all
@@ -2234,12 +2227,11 @@ parallelize_loops (void)
 	  fprintf (dump_file, "\nloop at %s:%d: ",
 		   LOCATION_FILE (loop_loc), LOCATION_LINE (loop_loc));
       }
-      gen_parallel_loop (loop, reduction_list,
+      gen_parallel_loop (loop, &reduction_list,
 			 n_threads, &niter_desc);
     }
 
   free_stmt_vec_info_vec ();
-  reduction_list.dispose ();
   obstack_free (&parloop_obstack, NULL);
 
   /* Parallelization will cause new function calls to be inserted through