fixes for darwin. Remove remnant references to vec_s.dnovillo/vec-rewrite

22 files changed, 36 insertions, 36 deletions

diff --git a/gcc/c-family/c-common.c b/gcc/c-family/c-common.c
index bd607ea4673..fac71901e0f 100644
--- a/gcc/c-family/c-common.c
+++ b/gcc/c-family/c-common.c
@@ -11185,7 +11185,7 @@ make_tree_vector (void)
     return tree_vector_cache->pop ();
   else
     {
-      /* Passing 0 to vec_s::alloc returns NULL, and our callers require
+      /* Passing 0 to vec::alloc returns NULL, and our callers require
 	 that we always return a non-NULL value.  The vector code uses
 	 4 when growing a NULL vector, so we do too.  */
       vec<tree, va_gc> *v;
diff --git a/gcc/cfganal.c b/gcc/cfganal.c
index efc1be56a42..89cc6a329d1 100644
--- a/gcc/cfganal.c
+++ b/gcc/cfganal.c
@@ -1145,7 +1145,7 @@ compute_idf (bitmap def_blocks, bitmap_head *dfs)
   phi_insertion_points = BITMAP_ALLOC (NULL);
 
   /* Seed the work list with all the blocks in DEF_BLOCKS.  We use
-     vec_s::quick_push here for speed.  This is safe because we know that
+     vec::quick_push here for speed.  This is safe because we know that
      the number of definition blocks is no greater than the number of
      basic blocks, which is the initial capacity of WORK_STACK.  */
   EXECUTE_IF_SET_IN_BITMAP (def_blocks, 0, bb_index, bi)
diff --git a/gcc/config/darwin.c b/gcc/config/darwin.c
index a52da2b4798..6645270a380 100644
--- a/gcc/config/darwin.c
+++ b/gcc/config/darwin.c
@@ -1874,9 +1874,9 @@ darwin_asm_named_section (const char *name,
       /* Keep the names, we'll need to make a table later.
          TODO: check that we do not revisit sections, that would break
          the assumption of how this is done.  */
-      if (!lto_section_names.exists ())
+      if (lto_section_names == NULL)
         vec_alloc (lto_section_names, 16);
-      lto_section_names.safe_push (e);
+      vec_safe_push (lto_section_names, e);
    }
   else if (strncmp (name, "__DWARF,", 8) == 0)
     darwin_asm_dwarf_section (name, flags, decl);
@@ -2633,7 +2633,7 @@ darwin_assemble_visibility (tree decl, int vis)
 	     "not supported in this configuration; ignored");
 }
 
-/* vec_s used by darwin_asm_dwarf_section.
+/* vec used by darwin_asm_dwarf_section.
    Maybe a hash tab would be better here - but the intention is that this is
    a very short list (fewer than 16 items) and each entry should (ideally, 
    eventually) only be presented once.
@@ -2670,11 +2670,11 @@ darwin_asm_dwarf_section (const char *name, unsigned int flags,
   sname = name + 8;
   namelen = strchr (sname, ',') - sname;
   gcc_assert (namelen);
-  if (!dwarf_sect_names_table.exists ())
+  if (dwarf_sect_names_table == NULL)
     vec_alloc (dwarf_sect_names_table, 16);
   else
     for (i = 0; 
-	 dwarf_sect_names_table.iterate (i, &ref);
+	 dwarf_sect_names_table->iterate (i, &ref);
 	 i++)
       {
 	if (!ref)
@@ -2694,7 +2694,7 @@ darwin_asm_dwarf_section (const char *name, unsigned int flags,
       fprintf (asm_out_file, "Lsection%.*s:\n", namelen, sname);
       e.count = 1;
       e.name = xstrdup (sname);
-      dwarf_sect_names_table.safe_push (e);
+      vec_safe_push (dwarf_sect_names_table, e);
     }
 }
 
@@ -2809,7 +2809,7 @@ darwin_file_end (void)
     }
 
   /* Output the names and indices.  */
-  if (lto_section_names && lto_section_names).length ()
+  if (lto_section_names && lto_section_names->length ())
     {
       int count;
       darwin_lto_section_e *ref;
@@ -2820,7 +2820,7 @@ darwin_file_end (void)
       /* Emit the names.  */
       fprintf (asm_out_file, "\t.section %s,%s,regular,debug\n",
 	       LTO_SEGMENT_NAME, LTO_NAMES_SECTION);
-      FOR_EACH_VEC_ELT (lto_section_names, count, ref)
+      FOR_EACH_VEC_ELT (*lto_section_names, count, ref)
 	{
 	  fprintf (asm_out_file, "L_GNU_LTO_NAME%d:\n", count);
          /* We have to jump through hoops to get the values of the intra-section
@@ -2843,7 +2843,7 @@ darwin_file_end (void)
       fputs ("\t.align\t2\n", asm_out_file);
       fputs ("# Section offset, Section length, Name offset, Name length\n",
 	     asm_out_file);
-      FOR_EACH_VEC_ELT (lto_section_names, count, ref)
+      FOR_EACH_VEC_ELT (*lto_section_names, count, ref)
 	{
 	  fprintf (asm_out_file, "%s L$gnu$lto$offs%d\t;# %s\n",
 		   op, count, ref->sectname);
diff --git a/gcc/config/sh/sh.c b/gcc/config/sh/sh.c
index 9d0e0dceb44..cf0abb474be 100644
--- a/gcc/config/sh/sh.c
+++ b/gcc/config/sh/sh.c
@@ -644,7 +644,7 @@ parse_validate_atomic_model_option (const char* str)
     std::getline (ss, tokens.back (), ',');
   }
 
-  if (tokens.is_empty ())
+  if (tokens.empty ())
     err_ret ("invalid atomic model option");
 
   /* The first token must be the atomic model name.  */
@@ -671,7 +671,7 @@ got_mode_name:;
 	{
 	  std::string offset_str = tokens[i].substr (strlen ("gbr-offset="));
 	  ret.tcb_gbr_offset = integral_argument (offset_str.c_str ());
-	  if (offset_str.is_empty () || ret.tcb_gbr_offset == -1)
+	  if (offset_str.empty () || ret.tcb_gbr_offset == -1)
 	    err_ret ("could not parse gbr-offset value \"%s\" in atomic model "
 		     "option", offset_str.c_str ());
 	}
diff --git a/gcc/cp/error.c b/gcc/cp/error.c
index ab37a277532..1980cd34bd7 100644
--- a/gcc/cp/error.c
+++ b/gcc/cp/error.c
@@ -1275,7 +1275,7 @@ dump_template_decl (tree t, int flags)
 }
 
 /* find_typenames looks through the type of the function template T
-   and returns a vec_s containing any typedefs, decltypes or TYPENAME_TYPEs
+   and returns a vec containing any typedefs, decltypes or TYPENAME_TYPEs
    it finds.  */
 
 struct find_typenames_t
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c
index 3aeda6703c7..63eeaf7d244 100644
--- a/gcc/dwarf2out.c
+++ b/gcc/dwarf2out.c
@@ -4572,7 +4572,7 @@ remove_AT (dw_die_ref die, enum dwarf_attribute attr_kind)
 	  if (a->dw_attr_val.v.val_str->refcount)
 	    a->dw_attr_val.v.val_str->refcount--;
 
-	/* vec_s::ordered_remove should help reduce the number of abbrevs
+	/* vec::ordered_remove should help reduce the number of abbrevs
 	   that are needed.  */
 	die->die_attr->ordered_remove (ix);
 	return;
diff --git a/gcc/gcse.c b/gcc/gcse.c
index cd1f87ed3b4..4be7cdc616b 100644
--- a/gcc/gcse.c
+++ b/gcc/gcse.c
@@ -3283,7 +3283,7 @@ hoist_code (void)
 		 to nullify any benefit we get from code hoisting.  */
 	      if (hoistable > 1 && dbg_cnt (hoist_insn))
 		{
-		  /* If (hoistable != vec_s::length), then there is
+		  /* If (hoistable != vec::length), then there is
 		     an occurrence of EXPR in BB itself.  Don't waste
 		     time looking for LCA in this case.  */
 		  if ((unsigned) hoistable == occrs_to_hoist.length ())
diff --git a/gcc/omp-low.c b/gcc/omp-low.c
index 33e648ebfc4..54997072df4 100644
--- a/gcc/omp-low.c
+++ b/gcc/omp-low.c
@@ -4773,7 +4773,7 @@ expand_omp_sections (struct omp_region *region)
      and a default case to abort if something goes wrong.  */
   len = EDGE_COUNT (l0_bb->succs);
 
-  /* Use vec_s::quick_push on label_vec throughout, since we know the size
+  /* Use vec::quick_push on label_vec throughout, since we know the size
      in advance.  */
   label_vec.create (len);
 
diff --git a/gcc/sel-sched.c b/gcc/sel-sched.c
index 3de061855c5..f1d1a771f01 100644
--- a/gcc/sel-sched.c
+++ b/gcc/sel-sched.c
@@ -3726,7 +3726,7 @@ fill_vec_av_set (av_set_t av, blist_t bnds, fence_t fence,
     av_max_prio = est_ticks_till_branch = INT_MIN;
 
   /* Filter out inappropriate expressions.  Loop's direction is reversed to
-     visit "best" instructions first.  We assume that vec_s::unordered_remove
+     visit "best" instructions first.  We assume that vec::unordered_remove
      moves last element in place of one being deleted.  */
   for (n = vec_av_set.length () - 1, stalled = 0; n >= 0; n--)
     {
diff --git a/gcc/store-motion.c b/gcc/store-motion.c
index 25282eb16c8..57793f209e7 100644
--- a/gcc/store-motion.c
+++ b/gcc/store-motion.c
@@ -54,7 +54,7 @@ along with GCC; see the file COPYING3.  If not see
      invalidate REG_EQUAL/REG_EQUIV notes for?).
    - pattern_regs in st_expr should be a regset (on its own obstack).
    - antic_stores and avail_stores should be VECs instead of lists.
-   - store_motion_mems should be a vec_s instead of a list.
+   - store_motion_mems should be a vec instead of a list.
    - there should be an alloc pool for struct st_expr objects.
    - investigate whether it is helpful to make the address of an st_expr
      a cselib VALUE.
diff --git a/gcc/trans-mem.c b/gcc/trans-mem.c
index 97b2463607f..4edb98598ec 100644
--- a/gcc/trans-mem.c
+++ b/gcc/trans-mem.c
@@ -5179,7 +5179,7 @@ ipa_tm_execute (void)
     }
 
   /* Iterate scans until no more work to be done.  Prefer not to use
-     vec_s::_pop because the worklist tends to follow a breadth-first
+     vec::pop because the worklist tends to follow a breadth-first
      search of the callgraph, which should allow convergance with a
      minimum number of scans.  But we also don't want the worklist
      array to grow without bound, so we shift the array up periodically.  */
diff --git a/gcc/tree-call-cdce.c b/gcc/tree-call-cdce.c
index ff6576690ea..42f47523e25 100644
--- a/gcc/tree-call-cdce.c
+++ b/gcc/tree-call-cdce.c
@@ -513,7 +513,7 @@ gen_conditions_for_pow_int_base (tree base, tree expn,
 /* Method to generate conditional statements for guarding conditionally
    dead calls to pow.  One or more statements can be generated for
    each logical condition.  Statement groups of different conditions
-   are separated by a NULL tree and they are stored in the vec_s
+   are separated by a NULL tree and they are stored in the vec
    conds.  The number of logical conditions are stored in *nconds.
 
    See C99 standard, 7.12.7.4:2, for description of pow (x, y).
diff --git a/gcc/tree-eh.c b/gcc/tree-eh.c
index a27b0f7e0e2..922fcfe454b 100644
--- a/gcc/tree-eh.c
+++ b/gcc/tree-eh.c
@@ -1371,7 +1371,7 @@ lower_try_finally_switch (struct leh_state *state, struct leh_tf_state *tf)
   finally_tmp = create_tmp_var (integer_type_node, "finally_tmp");
   finally_label = create_artificial_label (finally_loc);
 
-  /* We use vec_s::quick_push on case_label_vec throughout this function,
+  /* We use vec::quick_push on case_label_vec throughout this function,
      since we know the size in advance and allocate precisely as muce
      space as needed.  */
   case_label_vec.create (ndests);
diff --git a/gcc/tree-into-ssa.c b/gcc/tree-into-ssa.c
index a7fa1191651..2a389895d3d 100644
--- a/gcc/tree-into-ssa.c
+++ b/gcc/tree-into-ssa.c
@@ -101,7 +101,7 @@ sbitmap interesting_blocks;
    released after we finish updating the SSA web.  */
 static bitmap names_to_release;
 
-/* vec_s of vec_s of PHIs to rewrite in a basic block.  Element I corresponds
+/* vec of vec of PHIs to rewrite in a basic block.  Element I corresponds
    the to basic block with index I.  Allocated once per compilation, *not*
    released between different functions.  */
 static vec<gimple_vec> phis_to_rewrite;
diff --git a/gcc/tree-ssa-operands.c b/gcc/tree-ssa-operands.c
index a80fef3637a..c98bfda1c14 100644
--- a/gcc/tree-ssa-operands.c
+++ b/gcc/tree-ssa-operands.c
@@ -312,7 +312,7 @@ add_use_op (gimple stmt, tree *op, use_optype_p last)
 
 
 /* Takes elements from build_defs and turns them into def operands of STMT.
-   TODO -- Make build_defs vec_s of tree *.  */
+   TODO -- Make build_defs vec of tree *.  */
 
 static inline void
 finalize_ssa_defs (gimple stmt)
@@ -351,7 +351,7 @@ finalize_ssa_defs (gimple stmt)
 
 
 /* Takes elements from build_uses and turns them into use operands of STMT.
-   TODO -- Make build_uses vec_s of tree *.  */
+   TODO -- Make build_uses vec of tree *.  */
 
 static inline void
 finalize_ssa_uses (gimple stmt)
diff --git a/gcc/tree-ssa-pre.c b/gcc/tree-ssa-pre.c
index 69ed963c316..eb0a946d84e 100644
--- a/gcc/tree-ssa-pre.c
+++ b/gcc/tree-ssa-pre.c
@@ -250,9 +250,9 @@ alloc_expression_id (pre_expr expr)
   if (expr->kind == NAME)
     {
       unsigned version = SSA_NAME_VERSION (PRE_EXPR_NAME (expr));
-      /* vec_s::safe_grow_cleared allocates no headroom.  Avoid frequent
-	 re-allocations by using vec_s::reserve upfront.  There is no
-	 vec_s::quick_grow_cleared unfortunately.  */
+      /* vec::safe_grow_cleared allocates no headroom.  Avoid frequent
+	 re-allocations by using vec::reserve upfront.  There is no
+	 vec::quick_grow_cleared unfortunately.  */
       unsigned old_len = name_to_id.length ();
       name_to_id.reserve (num_ssa_names - old_len);
       name_to_id.safe_grow_cleared (num_ssa_names);
diff --git a/gcc/tree-ssa-sccvn.c b/gcc/tree-ssa-sccvn.c
index 4ee2ac3d1bc..ed89a5ab0d9 100644
--- a/gcc/tree-ssa-sccvn.c
+++ b/gcc/tree-ssa-sccvn.c
@@ -155,7 +155,7 @@ static vec<tree> sccstack;
 
 /* Table of vn_ssa_aux_t's, one per ssa_name.  The vn_ssa_aux_t objects
    are allocated on an obstack for locality reasons, and to free them
-   without looping over the vec_s.  */
+   without looping over the vec.  */
 
 static vec<vn_ssa_aux_t> vn_ssa_aux_table;
 static struct obstack vn_ssa_aux_obstack;
diff --git a/gcc/tree-ssa-structalias.c b/gcc/tree-ssa-structalias.c
index 85f9e452bf1..787115ff340 100644
--- a/gcc/tree-ssa-structalias.c
+++ b/gcc/tree-ssa-structalias.c
@@ -5145,7 +5145,7 @@ push_fields_onto_fieldstack (tree type, vec<fieldoff_s> *fieldstack,
     return false;
 
   /* If the vector of fields is growing too big, bail out early.
-     Callers check for vec_s::length <= MAX_FIELDS_FOR_FIELD_SENSITIVE, make
+     Callers check for vec::length <= MAX_FIELDS_FOR_FIELD_SENSITIVE, make
      sure this fails.  */
   if (fieldstack->length () > MAX_FIELDS_FOR_FIELD_SENSITIVE)
     return false;
diff --git a/gcc/tree-streamer-in.c b/gcc/tree-streamer-in.c
index a0e7ad46155..62649d18eec 100644
--- a/gcc/tree-streamer-in.c
+++ b/gcc/tree-streamer-in.c
@@ -907,7 +907,7 @@ lto_input_ts_binfo_tree_pointers (struct lto_input_block *ib,
 
   /* Note that the number of slots in EXPR was read in
      streamer_alloc_tree when instantiating EXPR.  However, the
-     vector is empty so we cannot rely on vec_s::length to know how many
+     vector is empty so we cannot rely on vec::length to know how many
      elements to read.  So, this list is emitted as a 0-terminated
      list on the writer side.  */
   do
diff --git a/gcc/tree.c b/gcc/tree.c
index 4ab60297a61..477ea0e5e68 100644
--- a/gcc/tree.c
+++ b/gcc/tree.c
@@ -1408,7 +1408,7 @@ build_vector_from_val (tree vectype, tree sc)
 }
 
 /* Return a new CONSTRUCTOR node whose type is TYPE and whose values
-   are in the vec_s pointed to by VALS.  */
+   are in the vec pointed to by VALS.  */
 tree
 build_constructor (tree type, vec<constructor_elt, va_gc> *vals)
 {
@@ -4113,7 +4113,7 @@ build_nt (enum tree_code code, ...)
 }
 
 /* Similar to build_nt, but for creating a CALL_EXPR object with a
-   tree vec_s.  */
+   tree vec.  */
 
 tree
 build_nt_call_vec (tree fn, vec<tree, va_gc> *args)
@@ -10141,7 +10141,7 @@ build_call_array_loc (location_t loc, tree return_type, tree fn,
   return t;
 }
 
-/* Like build_call_array, but takes a vec_s.  */
+/* Like build_call_array, but takes a vec.  */
 
 tree
 build_call_vec (tree return_type, tree fn, vec<tree, va_gc> *args)
diff --git a/gcc/value-prof.c b/gcc/value-prof.c
index 8e56eb926a2..ac8a0b61458 100644
--- a/gcc/value-prof.c
+++ b/gcc/value-prof.c
@@ -73,7 +73,7 @@ along with GCC; see the file COPYING3.  If not see
    to profile.  There are different histogram types (see HIST_TYPE_* in
    value-prof.h) and each transformation can request one or more histogram
    types per GIMPLE statement.  The function gimple_find_values_to_profile()
-   collects the values to profile in a vec_s, and adds the number of counters
+   collects the values to profile in a vec, and adds the number of counters
    required for the different histogram types.
 
    For a -fprofile-generate run, the statements for which values should be
diff --git a/gcc/var-tracking.c b/gcc/var-tracking.c
index cdd27a27ac8..e95cf87a752 100644
--- a/gcc/var-tracking.c
+++ b/gcc/var-tracking.c
@@ -8267,7 +8267,7 @@ resolve_expansions_pending_recursion (vec<rtx, va_stack> pending)
 }
 
 /* Initialize expand_loc_callback_data D with variable hash table V.
-   It must be a macro because of alloca (vec_s stack).  */
+   It must be a macro because of alloca (vec stack).  */
 #define INIT_ELCD(d, v)						\
   do								\
     {								\