This patch rewrites the old VEC macro-based interface into a new one

based on the template class 'vec'.  The user-visible changes are
described in http://gcc.gnu.org/wiki/cxx-conversion/cxx-vec.

I have tested the patch pretty extensively:

- Regular bootstraps on x86_64, ppc, ia64, sparc and hppa.
- Bootstraps with --enable-checking=release
- Bootstraps with --enable-checking=gc,gcac
- Basic builds on all targets (using contrib/config-list.mk).

We no longer access the vectors via VEC_* macros.  The pattern is
"VEC_operation (T, A, V, args)" becomes "V.operation (args)".

The only thing I could not do is create proper ctors and dtors for the
vec class.  Since these vectors are stored in unions, we
have to keep them as PODs (C++03 does not allow non-PODs in unions).

This means that creation and destruction must be explicit.  There is a
new method vec<type, allocation, layout>::create() and another vec<type,
allocation, layout>::destroy() to allocate the internal vector.

For vectors that must be pointers, there is a family of free functions
that implement the operations that need to tolerate NULL vectors.
These functions all start with the prefix 'vec_safe_'.  See the wiki
page for details.

The gengtype change removes the special handling for VEC() that used
to exist in gengtype. Additionally, it allows gengtype to recognize
templates of more than one argument and introduces the concept of an
undefined type (useful for template arguments that may or may not be
types).

When a TYPE_UNDEFINED is reached, gengtype will ignore it if it
happens inside a type marked with GTY((user)).  Otherwise, it will
emit an error.

Finally, gengtype rejects root types marked GTY((user)) that are not
first class pointers.

2012-11-16  Diego Novillo  <dnovillo@google.com>

	VEC API overhaul (http://gcc.gnu.org/wiki/cxx-conversion/cxx-vec)

	* vec.c (register_overhead): Convert it into
	member function of vec_prefix.
	(release_overhead): Likewise.
	(calculate_allocation): Likewise.
	(vec_heap_free): Remove.
	(vec_gc_o_reserve_1): Remove.
	(vec_heap_o_reserve_1): Remove.
	(vec_stack_o_reserve_1): Remove.
	(vec_stack_o_reserve_exact): Remove.
	(register_stack_vec): New.
	(stack_vec_register_index): New.
	(unregister_stack_vec): New.
	(vec_assert_fail): Remove.
	* vec.h: Conditionally include ggc.h.  Document conditional
	hackery.
	Update top-level documentation.
	(ALONE_VEC_CHECK_INFO): Remove.
	(VEC_CHECK_INFO): Remove.
	(ALONE_VEC_CHECK_DECL): Remove.
	(VEC_CHECK_DECL): Remove.
	(ALONE_VEC_CHECK_PASS): Remove.
	(VEC_CHECK_PASS): Remove.
	(VEC_ASSERT): Remove.
	(vec_prefix): Add friends va_gc, va_gc_atomic, va_heap and
	va_stack.
	Mark fields alloc_ and num_ as protected.
	(struct vec_t): Remove.  Remove all function members.
	(struct vl_embed): Declare.
	(struct vl_ptr): Declare.
	(free): Remove.
	(reserve_exact): Remove.
	(reserve): Remove.
	(safe_splice): Remove.
	(safe_push): Remove.
	(safe_grow): Remove.
	(safe_grow_cleared): Remove.
	(safe_insert): Remove.
	(DEF_VEC_I): Remove.
	(DEF_VEC_ALLOC_I): Remove.
	(DEF_VEC_P): Remove.
	(DEF_VEC_ALLOC_P): Remove.
	(DEF_VEC_O): Remove.
	(DEF_VEC_ALLOC_O): Remove.
	(DEF_VEC_ALLOC_P_STACK): Remove.
	(DEF_VEC_ALLOC_O_STACK): Remove.
	(DEF_VEC_ALLOC_I_STACK): Remove.
	(DEF_VEC_A): Remove.
	(DEF_VEC_ALLOC_A): Remove.
	(vec_stack_p_reserve_exact_1): Remove.
	(vec_stack_o_reserve): Remove.
	(vec_stack_o_reserve_exact): Remove.
	(VEC_length): Remove.
	(VEC_empty): Remove.
	(VEC_address): Remove.
	(vec_address): Remove.
	(VEC_last): Remove.
	(VEC_index): Remove.
	(VEC_iterate): Remove.
	(VEC_embedded_size): Remove.
	(VEC_embedded_init): Remove.
	(VEC_free): Remove.
	(VEC_copy): Remove.
	(VEC_space): Remove.
	(VEC_reserve): Remove.
	(VEC_reserve_exact): Remove.
	(VEC_splice): Remove.
	(VEC_safe_splice): Remove.
	(VEC_quick_push): Remove.
	(VEC_safe_push): Remove.
	(VEC_pop): Remove.
	(VEC_truncate): Remove.
	(VEC_safe_grow): Remove.
	(VEC_replace): Remove.
	(VEC_quick_insert): Remove.
	(VEC_safe_insert): Remove.
	(VEC_ordered_remove): Remove.
	(VEC_unordered_remove): Remove.
	(VEC_block_remove): Remove.
	(VEC_lower_bound): Remove.
	(VEC_alloc): Remove.
	(VEC_qsort): Remove.

	(va_heap): Declare.
	(va_heap::default_layout): New typedef to vl_ptr.
	(va_heap::reserve): New.
	(va_heap::release): New.
	(va_gc): Declare.
	(va_gc::default_layout): New typedef to vl_embed.
	(va_gc::reserve): New.
	(va_gc::release): New.
	(va_gc_atomic): Declare.  Inherit from va_gc.
	(va_stack): Declare.
	(va_stack::default_layout): New typedef to vl_ptr.
	(va_stack::alloc): New.
	(va_stack::reserve): New.
	(va_stack::release): New.
	(register_stack_vec): Declare.
	(stack_vec_register_index): Declare.
	(unregister_stack_vec): Declare.

	(vec<T, A = va_heap, L = typename A::default_layout>): Declare
	empty vec template.
	(vec<T, A, vl_embed>): Partial specialization for embedded
	layout.
	(vec<T, A, vl_embed>::allocated): New.
	(vec<T, A, vl_embed>::length): New.
	(vec<T, A, vl_embed>::is_empty): New.
	(vec<T, A, vl_embed>::address): New.
	(vec<T, A, vl_embed>::operator[]): New.
	(vec<T, A, vl_embed>::last New.
	(vec<T, A, vl_embed>::space): New.
	(vec<T, A, vl_embed>::iterate): New.
	(vec<T, A, vl_embed>::iterate): New.
	(vec<T, A, vl_embed>::copy): New.
	(vec<T, A, vl_embed>::splice): New.
	(vec<T, A, vl_embed>::quick_push New.
	(vec<T, A, vl_embed>::pop New.
	(vec<T, A, vl_embed>::truncate): New.
	(vec<T, A, vl_embed>::quick_insert): New.
	(vec<T, A, vl_embed>::ordered_remove): New.
	(vec<T, A, vl_embed>::unordered_remove): New.
	(vec<T, A, vl_embed>::block_remove): New.
	(vec<T, A, vl_embed>::qsort): New.
	(vec<T, A, vl_embed>::lower_bound): New.
	(vec<T, A, vl_embed>::embedded_size): New.
	(vec<T, A, vl_embed>::embedded_init): New.
	(vec<T, A, vl_embed>::quick_grow): New.
	(vec<T, A, vl_embed>::quick_grow_cleared): New.
	(vec_safe_space): New.
	(vec_safe_length): New.
	(vec_safe_address): New.
	(vec_safe_is_empty): New.
	(vec_safe_reserve): New.
	(vec_safe_reserve_exact): New.
	(vec_alloc): New.
	(vec_free): New.
	(vec_safe_grow): New.
	(vec_safe_grow_cleared): New.
	(vec_safe_iterate): New.
	(vec_safe_push): New.
	(vec_safe_insert): New.
	(vec_safe_truncate): New.
	(vec_safe_copy): New.
	(vec_safe_splice): New.

	(vec<T, A, vl_ptr>): New partial specialization for the space
	efficient layout.
	(vec<T, A, vl_ptr>::exists): New.
	(vec<T, A, vl_ptr>::is_empty): New.
	(vec<T, A, vl_ptr>::length): New.
	(vec<T, A, vl_ptr>::address): New.
	(vec<T, A, vl_ptr>::operator[]): New.
	(vec<T, A, vl_ptr>::operator!=): New.
	(vec<T, A, vl_ptr>::operator==): New.
	(vec<T, A, vl_ptr>::last): New.
	(vec<T, A, vl_ptr>::space): New.
	(vec<T, A, vl_ptr>::iterate): New.
	(vec<T, A, vl_ptr>::copy): New.
	(vec<T, A, vl_ptr>::reserve): New.
	(vec<T, A, vl_ptr>::reserve_exact): New.
	(vec<T, A, vl_ptr>::splice): New.
	(vec<T, A, vl_ptr>::safe_splice): New.
	(vec<T, A, vl_ptr>::quick_push): New.
	(vec<T, A, vl_ptr>::safe_push): New.
	(vec<T, A, vl_ptr>::pop): New.
	(vec<T, A, vl_ptr>::truncate): New.
	(vec<T, A, vl_ptr>::safe_grow): New.
	(vec<T, A, vl_ptr>::safe_grow_cleared): New.
	(vec<T, A, vl_ptr>::quick_grow): New.
	(vec<T, A, vl_ptr>::quick_grow_cleared): New.
	(vec<T, A, vl_ptr>::quick_insert): New.
	(vec<T, A, vl_ptr>::safe_insert): New.
	(vec<T, A, vl_ptr>::ordered_remove): New.
	(vec<T, A, vl_ptr>::unordered_remove): New.
	(vec<T, A, vl_ptr>::block_remove): New.
	(vec<T, A, vl_ptr>::qsort): New.
	(vec<T, A, vl_ptr>::lower_bound): New.
	(vec_stack_alloc): Define.
	(FOR_EACH_VEC_SAFE_ELT): Define.
	* vecir.h: Remove.  Update all users.
	* vecprim.h: Remove.  Update all users.
	Move uchar to coretypes.h.

	* Makefile.in (VEC_H): Add $(GGC_H).
	Remove vecir.h and vecprim.h dependencies everywhere.

2012-11-16  Diego Novillo  <dnovillo@google.com>

	* gengtype-lex.l (VEC): Remove.
	Add characters in the set [\!\>\.-].
	* gengtype-parse.c (token_names): Remove "VEC".
	(require_template_declaration): Remove handling of VEC_TOKEN.
	(type): Likewise.
	Call create_user_defined_type when parsing GTY((user)).
	* gengtype-state.c (type_lineloc): handle TYPE_UNDEFINED.
	(write_state_undefined_type): New.
	(write_state_type): Call write_state_undefined_type for
	TYPE_UNDEFINED.
	(read_state_type): Call read_state_undefined_type for
	TYPE_UNDEFINED.
	* gengtype.c (dbgprint_count_type_at): Handle TYPE_UNDEFINED.
	(create_user_defined_type): Make extern.
	(type_for_name): Factor out of resolve_typedef.
	(create_undefined_type): New
	(resolve_typedef): Call it when we cannot find a previous
	typedef and the type is not a template.
	(find_structure): Accept TYPE_UNDEFINED.
	(set_gc_used_type): Add argument ALLOWED_UNDEFINED_TYPES,
	default to false.
	Emit an error for TYPE_UNDEFINED unless LEVEL is GC_UNUSED or
	ALLOWED_UNDEFINED_TYPES is set.
	Set ALLOWED_UNDEFINED_TYPES to true for TYPE_USER_STRUCT.
	(filter_type_name): Accept templates with more than one
	argument.
	(output_mangled_typename): Handle TYPE_UNDEFINED
	(walk_type): Likewise.
	(write_types_process_field): Likewise.
	(write_func_for_structure): If CHAIN_NEXT is set, ORIG_S
	should not be a user-defined type.
	(write_types_local_user_process_field): Handle TYPE_ARRAY,
	TYPE_NONE and TYPE_UNDEFINED.
	(write_types_local_process_field): Likewise.
	(contains_scalar_p): Return 0 for TYPE_USER_STRUCT.
	(write_root): Reject user-defined types that are not pointers.
	Handle TYPE_NONE, TYPE_UNDEFINED, TYPE_UNION, TYPE_LANG_STRUCT
	and TYPE_PARAM_STRUCT.
	(output_typename): Handle TYPE_NONE, TYPE_UNDEFINED, and
	TYPE_ARRAY.
	(dump_typekind): Handle TYPE_UNDEFINED.
	* gengtype.h (enum typekind): Add TYPE_UNDEFINED.
	(create_user_defined_type): Declare.
	(enum gty_token): Remove VEC_TOKEN.

2012-11-16  Diego Novillo  <dnovillo@google.com>

	Adjust for new vec API (http://gcc.gnu.org/wiki/cxx-conversion/cxx-vec)

	* coretypes.h (uchar): Define.
	* alias.c: Use new vec API in vec.h.
	* asan.c: Likewise.
	* attribs.c: Likewise.
	* basic-block.h: Likewise.
	* bb-reorder.c: Likewise.
	* builtins.c: Likewise.
	* calls.c: Likewise.
	* cfg.c: Likewise.
	* cfganal.c: Likewise.
	* cfgcleanup.c: Likewise.
	* cfgexpand.c: Likewise.
	* cfghooks.c: Likewise.
	* cfghooks.h: Likewise.
	* cfgloop.c: Likewise.
	* cfgloop.h: Likewise.
	* cfgloopanal.c: Likewise.
	* cfgloopmanip.c: Likewise.
	* cfgrtl.c: Likewise.
	* cgraph.c: Likewise.
	* cgraph.h: Likewise.
	* cgraphclones.c: Likewise.
	* cgraphunit.c: Likewise.
	* combine.c: Likewise.
	* compare-elim.c: Likewise.
	* coverage.c: Likewise.
	* cprop.c: Likewise.
	* data-streamer.h: Likewise.
	* dbxout.c: Likewise.
	* dce.c: Likewise.
	* df-core.c: Likewise.
	* df-problems.c: Likewise.
	* df-scan.c: Likewise.
	* dominance.c: Likewise.
	* domwalk.c: Likewise.
	* domwalk.h: Likewise.
	* dse.c: Likewise.
	* dwarf2cfi.c: Likewise.
	* dwarf2out.c: Likewise.
	* dwarf2out.h: Likewise.
	* emit-rtl.c: Likewise.
	* except.c: Likewise.
	* except.h: Likewise.
	* expr.c: Likewise.
	* expr.h: Likewise.
	* final.c: Likewise.
	* fold-const.c: Likewise.
	* function.c: Likewise.
	* function.h: Likewise.
	* fwprop.c: Likewise.
	* gcc.c: Likewise.
	* gcse.c: Likewise.
	* genattr.c: Likewise.
	* genattrtab.c: Likewise.
	* genautomata.c: Likewise.
	* genextract.c: Likewise.
	* genopinit.c: Likewise
	* ggc-common.c: Likewise.
	* ggc.h: Likewise.
	* gimple-low.c: Likewise.
	* gimple-ssa-strength-reduction.c: Likewise.
	* gimple-streamer-in.c: Likewise.
	* gimple.c: Likewise.
	* gimple.h: Likewise.
	* gimplify.c: Likewise.
	* graph.c: Likewise.
	* graphds.c: Likewise.
	* graphds.h: Likewise.
	* graphite-blocking.c: Likewise.
	* graphite-clast-to-gimple.c: Likewise.
	* graphite-dependences.c: Likewise.
	* graphite-interchange.c: Likewise.
	* graphite-optimize-isl.c: Likewise.
	* graphite-poly.c: Likewise.
	* graphite-poly.h: Likewise.
	* graphite-scop-detection.c: Likewise.
	* graphite-scop-detection.h: Likewise.
	* graphite-sese-to-poly.c: Likewise.
	* graphite.c: Likewise.
	* godump.c: Likewise.
	* haifa-sched.c: Likewise.
	* hw-doloop.c: Likewise.
	* hw-doloop.h: Likewise.
	* ifcvt.c: Likewise.
	* insn-addr.h: Likewise.
	* ipa-cp.c: Likewise.
	* ipa-inline-analysis.c: Likewise.
	* ipa-inline-transform.c: Likewise.
	* ipa-inline.c: Likewise.
	* ipa-inline.h: Likewise.
	* ipa-prop.c: Likewise.
	* ipa-prop.h: Likewise.
	* ipa-pure-const.c: Likewise.
	* ipa-ref-inline.h: Likewise.
	* ipa-ref.c: Likewise.
	* ipa-ref.h: Likewise.
	* ipa-reference.c: Likewise.
	* ipa-split.c: Likewise.
	* ipa-utils.c: Likewise.
	* ipa-utils.h: Likewise.
	* ipa.c: Likewise.
	* ira-build.c: Likewise.
	* ira-color.c: Likewise.
	* ira-emit.c: Likewise.
	* ira-int.h: Likewise.
	* ira.c: Likewise.
	* loop-invariant.c: Likewise.
	* loop-unroll.c: Likewise.
	* lower-subreg.c: Likewise.
	* lra-lives.c: Likewise.
	* lra.c: Likewise.
	* lto-cgraph.c: Likewise.
	* lto-section-out.c: Likewise.
	* lto-streamer-in.c: Likewise.
	* lto-streamer-out.c: Likewise.
	* lto-streamer.h: Likewise.
	* lto-symtab.c: Likewise.
	* mcf.c: Likewise.
	* modulo-sched.c: Likewise.
	* omp-low.c: Likewise.
	* opts-common.c: Likewise.
	* opts-global.c: Likewise.
	* opts.c: Likewise.
	* opts.h: Likewise.
	* passes.c: Likewise.
	* predict.c: Likewise.
	* print-tree.c: Likewise.
	* profile.c: Likewise.
	* profile.h: Likewise.
	* read-rtl.c: Likewise.
	* ree.c: Likewise.
	* reg-stack.c: Likewise.
	* regrename.c: Likewise.
	* regrename.h: Likewise.
	* reload.c: Likewise.
	* reload.h: Likewise.
	* reload1.c: Likewise.
	* rtl.h: Likewise.
	* sched-deps.c: Likewise.
	* sched-int.h: Likewise.
	* sdbout.c: Likewise.
	* sel-sched-dump.c: Likewise.
	* sel-sched-ir.c: Likewise.
	* sel-sched-ir.h: Likewise.
	* sel-sched.c: Likewise.
	* sese.c: Likewise.
	* sese.h: Likewise.
	* statistics.h: Likewise.
	* stmt.c: Likewise.
	* stor-layout.c: Likewise.
	* store-motion.c: Likewise.
	* tlink.c: Likewise.
	* toplev.c: Likewise.
	* trans-mem.c: Likewise.
	* tree-browser.c: Likewise.
	* tree-call-cdce.c: Likewise.
	* tree-cfg.c: Likewise.
	* tree-cfgcleanup.c: Likewise.
	* tree-chrec.c: Likewise.
	* tree-chrec.h: Likewise.
	* tree-complex.c: Likewise.
	* tree-data-ref.c: Likewise.
	* tree-data-ref.h: Likewise.
	* tree-dfa.c: Likewise.
	* tree-diagnostic.c: Likewise.
	* tree-dump.c: Likewise.
	* tree-eh.c: Likewise.
	* tree-emutls.c: Likewise.
	* tree-flow.h: Likewise.
	* tree-if-conv.c: Likewise.
	* tree-inline.c: Likewise.
	* tree-inline.h: Likewise.
	* tree-into-ssa.c: Likewise.
	* tree-iterator.c: Likewise.
	* tree-loop-distribution.c: Likewise.
	* tree-mudflap.c: Likewise.
	* tree-optimize.c: Likewise.
	* tree-outof-ssa.c: Likewise.
	* tree-parloops.c: Likewise.
	* tree-phinodes.c: Likewise.
	* tree-predcom.c: Likewise.
	* tree-pretty-print.c: Likewise.
	* tree-scalar-evolution.c: Likewise.
	* tree-sra.c: Likewise.
	* tree-ssa-address.c: Likewise.
	* tree-ssa-alias.c: Likewise.
	* tree-ssa-ccp.c: Likewise.
	* tree-ssa-coalesce.c: Likewise.
	* tree-ssa-dce.c: Likewise.
	* tree-ssa-dom.c: Likewise.
	* tree-ssa-forwprop.c: Likewise.
	* tree-ssa-live.c: Likewise.
	* tree-ssa-live.h: Likewise.
	* tree-ssa-loop-im.c: Likewise.
	* tree-ssa-loop-ivcanon.c: Likewise.
	* tree-ssa-loop-ivopts.c: Likewise.
	* tree-ssa-loop-manip.c: Likewise.
	* tree-ssa-loop-niter.c: Likewise.
	* tree-ssa-loop-prefetch.c: Likewise.
	* tree-ssa-math-opts.c: Likewise.
	* tree-ssa-operands.c: Likewise.
	* tree-ssa-phiopt.c: Likewise.
	* tree-ssa-phiprop.c: Likewise.
	* tree-ssa-pre.c: Likewise.
	* tree-ssa-propagate.c: Likewise.
	* tree-ssa-reassoc.c: Likewise.
	* tree-ssa-sccvn.c: Likewise.
	* tree-ssa-sccvn.h: Likewise.
	* tree-ssa-strlen.c: Likewise.
	* tree-ssa-structalias.c: Likewise.
	* tree-ssa-tail-merge.c: Likewise.
	* tree-ssa-threadedge.c: Likewise.
	* tree-ssa-threadupdate.c: Likewise.
	* tree-ssa-uncprop.c: Likewise.
	* tree-ssa-uninit.c: Likewise.
	* tree-ssa.c: Likewise.
	* tree-ssanames.c: Likewise.
	* tree-stdarg.c: Likewise.
	* tree-streamer-in.c: Likewise.
	* tree-streamer-out.c: Likewise.
	* tree-streamer.c: Likewise.
	* tree-streamer.h: Likewise.
	* tree-switch-conversion.c: Likewise.
	* tree-vect-data-refs.c: Likewise.
	* tree-vect-generic.c: Likewise.
	* tree-vect-loop-manip.c: Likewise.
	* tree-vect-loop.c: Likewise.
	* tree-vect-patterns.c: Likewise.
	* tree-vect-slp.c: Likewise.
	* tree-vect-stmts.c: Likewise.
	* tree-vectorizer.c: Likewise.
	* tree-vectorizer.h: Likewise.
	* tree-vrp.c: Likewise.
	* tree.c: Likewise.
	* tree.h: Likewise.
	* value-prof.c: Likewise.
	* value-prof.h: Likewise.
	* var-tracking.c: Likewise.
	* varasm.c: Likewise.
	* varpool.c: Likewise.
	* vmsdbgout.c: Likewise.
	* config/bfin/bfin.c: Likewise.
	* config/c6x/c6x.c: Likewise.
	* config/darwin.c: Likewise.
	* config/i386/i386.c: Likewise.
	* config/ia64/ia64.c: Likewise.
	* config/mep/mep.c: Likewise.
	* config/mips/mips.c: Likewise.
	* config/pa/pa.c: Likewise.
	* config/rs6000/rs6000-c.c: Likewise.
	* config/rs6000/rs6000.c: Likewise.
	* config/rx/rx.c: Likewise.
	* config/spu/spu-c.c: Likewise.
	* config/vms/vms.c: Likewise.
	* config/vxworks.c: Likewise.
	* config/epiphany/resolve-sw-modes.c: Likewise.

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

1 files changed, 138 insertions, 151 deletions

diff --git a/gcc/ipa-cp.c b/gcc/ipa-cp.c
index 82b0b53ce25..57382b5a338 100644
--- a/gcc/ipa-cp.c
+++ b/gcc/ipa-cp.c
@@ -830,7 +830,7 @@ ipa_value_from_jfunc (struct ipa_node_params *info, struct ipa_jump_func *jfunc)
 	idx = ipa_get_jf_ancestor_formal_id (jfunc);
 
       if (info->ipcp_orig_node)
-	input = VEC_index (tree, info->known_vals, idx);
+	input = info->known_vals[idx];
       else
 	{
 	  struct ipcp_lattice *lat;
@@ -1390,7 +1390,7 @@ propagate_aggs_accross_jump_function (struct cgraph_edge *cs,
       if (set_check_aggs_by_ref (dest_plats, jfunc->agg.by_ref))
 	return true;
 
-      FOR_EACH_VEC_ELT (ipa_agg_jf_item_t, jfunc->agg.items, i, item)
+      FOR_EACH_VEC_ELT (*jfunc->agg.items, i, item)
 	{
 	  HOST_WIDE_INT val_size;
 
@@ -1483,9 +1483,9 @@ propagate_constants_accross_call (struct cgraph_edge *cs)
 
 tree
 ipa_get_indirect_edge_target (struct cgraph_edge *ie,
-			      VEC (tree, heap) *known_vals,
-			      VEC (tree, heap) *known_binfos,
-			      VEC (ipa_agg_jump_function_p, heap) *known_aggs)
+			      vec<tree> known_vals,
+			      vec<tree> known_binfos,
+			      vec<ipa_agg_jump_function_p> known_aggs)
 {
   int param_index = ie->indirect_info->param_index;
   HOST_WIDE_INT token, anc_offset;
@@ -1501,12 +1501,11 @@ ipa_get_indirect_edge_target (struct cgraph_edge *ie,
 
       if (ie->indirect_info->agg_contents)
 	{
-	  if (VEC_length (ipa_agg_jump_function_p, known_aggs)
+	  if (known_aggs.length ()
 	      > (unsigned int) param_index)
 	    {
 	      struct ipa_agg_jump_function *agg;
-	      agg = VEC_index (ipa_agg_jump_function_p, known_aggs,
-			       param_index);
+	      agg = known_aggs[param_index];
 	      t = ipa_find_agg_cst_for_param (agg, ie->indirect_info->offset,
 					      ie->indirect_info->by_ref);
 	    }
@@ -1514,8 +1513,8 @@ ipa_get_indirect_edge_target (struct cgraph_edge *ie,
 	    t = NULL;
 	}
       else
-	t = (VEC_length (tree, known_vals) > (unsigned int) param_index
-	     ? VEC_index (tree, known_vals, param_index) : NULL);
+	t = (known_vals.length () > (unsigned int) param_index
+	     ? known_vals[param_index] : NULL);
 
       if (t &&
 	  TREE_CODE (t) == ADDR_EXPR
@@ -1530,10 +1529,9 @@ ipa_get_indirect_edge_target (struct cgraph_edge *ie,
   anc_offset = ie->indirect_info->offset;
   otr_type = ie->indirect_info->otr_type;
 
-  t = VEC_index (tree, known_vals, param_index);
-  if (!t && known_binfos
-      && VEC_length (tree, known_binfos) > (unsigned int) param_index)
-    t = VEC_index (tree, known_binfos, param_index);
+  t = known_vals[param_index];
+  if (!t && known_binfos.length () > (unsigned int) param_index)
+    t = known_binfos[param_index];
   if (!t)
     return NULL_TREE;
 
@@ -1564,8 +1562,8 @@ ipa_get_indirect_edge_target (struct cgraph_edge *ie,
 
 static int
 devirtualization_time_bonus (struct cgraph_node *node,
-			     VEC (tree, heap) *known_csts,
-			     VEC (tree, heap) *known_binfos)
+			     vec<tree> known_csts,
+			     vec<tree> known_binfos)
 {
   struct cgraph_edge *ie;
   int res = 0;
@@ -1577,7 +1575,7 @@ devirtualization_time_bonus (struct cgraph_node *node,
       tree target;
 
       target = ipa_get_indirect_edge_target (ie, known_csts, known_binfos,
-					     NULL);
+					vec<ipa_agg_jump_function_p>());
       if (!target)
 	continue;
 
@@ -1664,10 +1662,10 @@ good_cloning_opportunity_p (struct cgraph_node *node, int time_benefit,
 /* Return all context independent values from aggregate lattices in PLATS in a
    vector.  Return NULL if there are none.  */
 
-static VEC (ipa_agg_jf_item_t, gc) *
+static vec<ipa_agg_jf_item_t, va_gc> *
 context_independent_aggregate_values (struct ipcp_param_lattices *plats)
 {
-  VEC (ipa_agg_jf_item_t, gc) *res = NULL;
+  vec<ipa_agg_jf_item_t, va_gc> *res = NULL;
 
   if (plats->aggs_bottom
       || plats->aggs_contain_variable
@@ -1682,7 +1680,7 @@ context_independent_aggregate_values (struct ipcp_param_lattices *plats)
 	struct ipa_agg_jf_item item;
 	item.offset = aglat->offset;
 	item.value = aglat->values->value;
-	VEC_safe_push (ipa_agg_jf_item_t, gc, res, item);
+	vec_safe_push (res, item);
       }
   return res;
 }
@@ -1694,22 +1692,22 @@ context_independent_aggregate_values (struct ipcp_param_lattices *plats)
 
 static bool
 gather_context_independent_values (struct ipa_node_params *info,
-			       VEC (tree, heap) **known_csts,
-			       VEC (tree, heap) **known_binfos,
-			       VEC (ipa_agg_jump_function_t, heap) **known_aggs,
+			       vec<tree> *known_csts,
+			       vec<tree> *known_binfos,
+			       vec<ipa_agg_jump_function_t> *known_aggs,
 			       int *removable_params_cost)
 {
   int i, count = ipa_get_param_count (info);
   bool ret = false;
 
-  *known_csts = NULL;
-  *known_binfos = NULL;
-  VEC_safe_grow_cleared (tree, heap, *known_csts, count);
-  VEC_safe_grow_cleared (tree, heap, *known_binfos, count);
+  known_csts->create (0);
+  known_binfos->create (0);
+  known_csts->safe_grow_cleared (count);
+  known_binfos->safe_grow_cleared (count);
   if (known_aggs)
     {
-      *known_aggs = NULL;
-      VEC_safe_grow_cleared (ipa_agg_jump_function_t, heap, *known_aggs, count);
+      known_aggs->create (0);
+      known_aggs->safe_grow_cleared (count);
     }
 
   if (removable_params_cost)
@@ -1725,7 +1723,7 @@ gather_context_independent_values (struct ipa_node_params *info,
 	  struct ipcp_value *val = lat->values;
 	  if (TREE_CODE (val->value) != TREE_BINFO)
 	    {
-	      VEC_replace (tree, *known_csts, i, val->value);
+	      (*known_csts)[i] = val->value;
 	      if (removable_params_cost)
 		*removable_params_cost
 		  += estimate_move_cost (TREE_TYPE (val->value));
@@ -1733,7 +1731,7 @@ gather_context_independent_values (struct ipa_node_params *info,
 	    }
 	  else if (plats->virt_call)
 	    {
-	      VEC_replace (tree, *known_binfos, i, val->value);
+	      (*known_binfos)[i] = val->value;
 	      ret = true;
 	    }
 	  else if (removable_params_cost
@@ -1748,11 +1746,11 @@ gather_context_independent_values (struct ipa_node_params *info,
 
       if (known_aggs)
 	{
-	  VEC (ipa_agg_jf_item_t, gc) *agg_items;
+	  vec<ipa_agg_jf_item_t, va_gc> *agg_items;
 	  struct ipa_agg_jump_function *ajf;
 
 	  agg_items = context_independent_aggregate_values (plats);
-	  ajf = &VEC_index (ipa_agg_jump_function_t, *known_aggs, i);
+	  ajf = &(*known_aggs)[i];
 	  ajf->items = agg_items;
 	  ajf->by_ref = plats->aggs_by_ref;
 	  ret |= agg_items != NULL;
@@ -1769,17 +1767,16 @@ gather_context_independent_values (struct ipa_node_params *info,
    I'd like to discuss how to change it first and this demonstrates the
    issue.  */
 
-static VEC (ipa_agg_jump_function_p, heap) *
-agg_jmp_p_vec_for_t_vec (VEC (ipa_agg_jump_function_t, heap) *known_aggs)
+static vec<ipa_agg_jump_function_p>
+agg_jmp_p_vec_for_t_vec (vec<ipa_agg_jump_function_t> known_aggs)
 {
-  VEC (ipa_agg_jump_function_p, heap) *ret;
+  vec<ipa_agg_jump_function_p> ret;
   struct ipa_agg_jump_function *ajf;
   int i;
 
-  ret = VEC_alloc (ipa_agg_jump_function_p, heap,
-		   VEC_length (ipa_agg_jump_function_t, known_aggs));
-  FOR_EACH_VEC_ELT (ipa_agg_jump_function_t, known_aggs, i, ajf)
-    VEC_quick_push (ipa_agg_jump_function_p, ret, ajf);
+  ret.create (known_aggs.length ());
+  FOR_EACH_VEC_ELT (known_aggs, i, ajf)
+    ret.quick_push (ajf);
   return ret;
 }
 
@@ -1791,9 +1788,9 @@ estimate_local_effects (struct cgraph_node *node)
 {
   struct ipa_node_params *info = IPA_NODE_REF (node);
   int i, count = ipa_get_param_count (info);
-  VEC (tree, heap) *known_csts, *known_binfos;
-  VEC (ipa_agg_jump_function_t, heap) *known_aggs;
-  VEC (ipa_agg_jump_function_p, heap) *known_aggs_ptrs;
+  vec<tree> known_csts, known_binfos;
+  vec<ipa_agg_jump_function_t> known_aggs;
+  vec<ipa_agg_jump_function_p> known_aggs_ptrs;
   bool always_const;
   int base_time = inline_summary (node)->time;
   int removable_params_cost;
@@ -1868,8 +1865,8 @@ estimate_local_effects (struct cgraph_node *node)
 
       if (lat->bottom
 	  || !lat->values
-	  || VEC_index (tree, known_csts, i)
-	  || VEC_index (tree, known_binfos, i))
+	  || known_csts[i]
+	  || known_binfos[i])
 	continue;
 
       for (val = lat->values; val; val = val->next)
@@ -1879,14 +1876,14 @@ estimate_local_effects (struct cgraph_node *node)
 
 	  if (TREE_CODE (val->value) != TREE_BINFO)
 	    {
-	      VEC_replace (tree, known_csts, i, val->value);
-	      VEC_replace (tree, known_binfos, i, NULL_TREE);
+	      known_csts[i] = val->value;
+	      known_binfos[i] = NULL_TREE;
 	      emc = estimate_move_cost (TREE_TYPE (val->value));
 	    }
 	  else if (plats->virt_call)
 	    {
-	      VEC_replace (tree, known_csts, i, NULL_TREE);
-	      VEC_replace (tree, known_binfos, i, val->value);
+	      known_csts[i] = NULL_TREE;
+	      known_binfos[i] = val->value;
 	      emc = 0;
 	    }
 	  else
@@ -1921,8 +1918,8 @@ estimate_local_effects (struct cgraph_node *node)
 	  val->local_time_benefit = time_benefit;
 	  val->local_size_cost = size;
 	}
-      VEC_replace (tree, known_binfos, i, NULL_TREE);
-      VEC_replace (tree, known_csts, i, NULL_TREE);
+      known_binfos[i] = NULL_TREE;
+      known_csts[i] = NULL_TREE;
     }
 
   for (i = 0; i < count ; i++)
@@ -1934,7 +1931,7 @@ estimate_local_effects (struct cgraph_node *node)
       if (plats->aggs_bottom || !plats->aggs)
 	continue;
 
-      ajf = &VEC_index (ipa_agg_jump_function_t, known_aggs, i);
+      ajf = &known_aggs[i];
       for (aglat = plats->aggs; aglat; aglat = aglat->next)
 	{
 	  struct ipcp_value *val;
@@ -1952,7 +1949,7 @@ estimate_local_effects (struct cgraph_node *node)
 
 	      item.offset = aglat->offset;
 	      item.value = val->value;
-	      VEC_safe_push (ipa_agg_jf_item_t, gc, ajf->items, item);
+	      vec_safe_push (ajf->items, item);
 
 	      estimate_ipcp_clone_size_and_time (node, known_csts, known_binfos,
 						 known_aggs_ptrs, &size, &time,
@@ -1978,22 +1975,18 @@ estimate_local_effects (struct cgraph_node *node)
 
 	      val->local_time_benefit = time_benefit;
 	      val->local_size_cost = size;
-	      VEC_pop (ipa_agg_jf_item_t, ajf->items);
+	      ajf->items->pop ();
 	    }
 	}
     }
 
   for (i = 0; i < count ; i++)
-    {
-      VEC_free (ipa_agg_jf_item_t, gc,
-                VEC_index (ipa_agg_jump_function_t, known_aggs, i).items);
-      VEC_index (ipa_agg_jump_function_t, known_aggs, i).items = NULL;
-    }
+    vec_free (known_aggs[i].items);
 
-  VEC_free (tree, heap, known_csts);
-  VEC_free (tree, heap, known_binfos);
-  VEC_free (ipa_agg_jump_function_t, heap, known_aggs);
-  VEC_free (ipa_agg_jump_function_p, heap, known_aggs_ptrs);
+  known_csts.release ();
+  known_binfos.release ();
+  known_aggs.release ();
+  known_aggs_ptrs.release ();
 }
 
 
@@ -2245,7 +2238,7 @@ ipcp_propagate_stage (struct topo_info *topo)
 
 static void
 ipcp_discover_new_direct_edges (struct cgraph_node *node,
-				VEC (tree, heap) *known_vals)
+				vec<tree> known_vals)
 {
   struct cgraph_edge *ie, *next_ie;
   bool found = false;
@@ -2255,7 +2248,9 @@ ipcp_discover_new_direct_edges (struct cgraph_node *node,
       tree target;
 
       next_ie = ie->next_callee;
-      target = ipa_get_indirect_edge_target (ie, known_vals, NULL, NULL);
+      target = ipa_get_indirect_edge_target (ie, known_vals,
+					vec<tree>(),
+					vec<ipa_agg_jump_function_p>());
       if (target)
 	{
 	  ipa_make_edge_direct_to_target (ie, target);
@@ -2270,15 +2265,14 @@ ipcp_discover_new_direct_edges (struct cgraph_node *node,
 /* Vector of pointers which for linked lists of clones of an original crgaph
    edge. */
 
-static VEC (cgraph_edge_p, heap) *next_edge_clone;
+static vec<cgraph_edge_p> next_edge_clone;
 
 static inline void
 grow_next_edge_clone_vector (void)
 {
-  if (VEC_length (cgraph_edge_p, next_edge_clone)
+  if (next_edge_clone.length ()
       <=  (unsigned) cgraph_edge_max_uid)
-    VEC_safe_grow_cleared (cgraph_edge_p, heap, next_edge_clone,
-			   cgraph_edge_max_uid + 1);
+    next_edge_clone.safe_grow_cleared (cgraph_edge_max_uid + 1);
 }
 
 /* Edge duplication hook to grow the appropriate linked list in
@@ -2289,9 +2283,8 @@ ipcp_edge_duplication_hook (struct cgraph_edge *src, struct cgraph_edge *dst,
 			    __attribute__((unused)) void *data)
 {
   grow_next_edge_clone_vector ();
-  VEC_replace (cgraph_edge_p, next_edge_clone, dst->uid,
-	       VEC_index (cgraph_edge_p, next_edge_clone, src->uid));
-  VEC_replace (cgraph_edge_p, next_edge_clone, src->uid, dst);
+  next_edge_clone[dst->uid] = next_edge_clone[src->uid];
+  next_edge_clone[src->uid] = dst;
 }
 
 /* See if NODE is a clone with a known aggregate value at a given OFFSET of a
@@ -2332,7 +2325,7 @@ cgraph_edge_brings_value_p (struct cgraph_edge *cs,
     {
       tree t;
       if (src->offset == -1)
-	t = VEC_index (tree, caller_info->known_vals, src->index);
+	t = caller_info->known_vals[src->index];
       else
 	t = get_clone_agg_value (cs->caller, src->offset, src->index);
       return (t != NULL_TREE
@@ -2366,7 +2359,7 @@ cgraph_edge_brings_value_p (struct cgraph_edge *cs,
 static inline struct cgraph_edge *
 get_next_cgraph_edge_clone (struct cgraph_edge *cs)
 {
-  return VEC_index (cgraph_edge_p, next_edge_clone, cs->uid);
+  return next_edge_clone[cs->uid];
 }
 
 /* Given VAL, iterate over all its sources and if they still hold, add their
@@ -2407,20 +2400,20 @@ get_info_about_necessary_edges (struct ipcp_value *val, int *freq_sum,
 /* Return a vector of incoming edges that do bring value VAL.  It is assumed
    their number is known and equal to CALLER_COUNT.  */
 
-static VEC (cgraph_edge_p,heap) *
+static vec<cgraph_edge_p> 
 gather_edges_for_value (struct ipcp_value *val, int caller_count)
 {
   struct ipcp_value_source *src;
-  VEC (cgraph_edge_p,heap) *ret;
+  vec<cgraph_edge_p> ret;
 
-  ret = VEC_alloc (cgraph_edge_p, heap, caller_count);
+  ret.create (caller_count);
   for (src = val->sources; src; src = src->next)
     {
       struct cgraph_edge *cs = src->cs;
       while (cs)
 	{
 	  if (cgraph_edge_brings_value_p (cs, src))
-	    VEC_quick_push (cgraph_edge_p, ret, cs);
+	    ret.quick_push (cs);
 	  cs = get_next_cgraph_edge_clone (cs);
 	}
     }
@@ -2604,12 +2597,12 @@ update_specialized_profile (struct cgraph_node *new_node,
 
 static struct cgraph_node *
 create_specialized_node (struct cgraph_node *node,
-			 VEC (tree, heap) *known_vals,
+			 vec<tree> known_vals,
 			 struct ipa_agg_replacement_value *aggvals,
-			 VEC (cgraph_edge_p,heap) *callers)
+			 vec<cgraph_edge_p> callers)
 {
   struct ipa_node_params *new_info, *info = IPA_NODE_REF (node);
-  VEC (ipa_replace_map_p,gc)* replace_trees = NULL;
+  vec<ipa_replace_map_p, va_gc> *replace_trees = NULL;
   struct cgraph_node *new_node;
   int i, count = ipa_get_param_count (info);
   bitmap args_to_skip;
@@ -2621,7 +2614,7 @@ create_specialized_node (struct cgraph_node *node,
       args_to_skip = BITMAP_GGC_ALLOC ();
       for (i = 0; i < count; i++)
 	{
-	  tree t = VEC_index (tree, known_vals, i);
+	  tree t = known_vals[i];
 
 	  if ((t && TREE_CODE (t) != TREE_BINFO)
 	      || !ipa_is_param_used (info, i))
@@ -2637,14 +2630,14 @@ create_specialized_node (struct cgraph_node *node,
 
   for (i = 0; i < count ; i++)
     {
-      tree t = VEC_index (tree, known_vals, i);
+      tree t = known_vals[i];
       if (t && TREE_CODE (t) != TREE_BINFO)
 	{
 	  struct ipa_replace_map *replace_map;
 
 	  replace_map = get_replacement_map (t, ipa_get_param (info, i));
 	  if (replace_map)
-	    VEC_safe_push (ipa_replace_map_p, gc, replace_trees, replace_map);
+	    vec_safe_push (replace_trees, replace_map);
 	}
     }
 
@@ -2658,9 +2651,8 @@ create_specialized_node (struct cgraph_node *node,
       if (aggvals)
 	ipa_dump_agg_replacement_values (dump_file, aggvals);
     }
-  gcc_checking_assert (ipa_node_params_vector
-		       && (VEC_length (ipa_node_params_t,
-				       ipa_node_params_vector)
+  gcc_checking_assert (ipa_node_params_vector.exists ()
+		       && (ipa_node_params_vector.length ()
 			   > (unsigned) cgraph_max_uid));
   update_profiling_info (node, new_node);
   new_info = IPA_NODE_REF (new_node);
@@ -2669,7 +2661,7 @@ create_specialized_node (struct cgraph_node *node,
 
   ipcp_discover_new_direct_edges (new_node, known_vals);
 
-  VEC_free (cgraph_edge_p, heap, callers);
+  callers.release ();
   return new_node;
 }
 
@@ -2679,8 +2671,8 @@ create_specialized_node (struct cgraph_node *node,
 
 static void
 find_more_scalar_values_for_callers_subset (struct cgraph_node *node,
-					    VEC (tree, heap) *known_vals,
-					    VEC (cgraph_edge_p,heap) *callers)
+					    vec<tree> known_vals,
+					    vec<cgraph_edge_p> callers)
 {
   struct ipa_node_params *info = IPA_NODE_REF (node);
   int i, count = ipa_get_param_count (info);
@@ -2691,11 +2683,10 @@ find_more_scalar_values_for_callers_subset (struct cgraph_node *node,
       tree newval = NULL_TREE;
       int j;
 
-      if (ipa_get_scalar_lat (info, i)->bottom
-	  || VEC_index (tree, known_vals, i))
+      if (ipa_get_scalar_lat (info, i)->bottom || known_vals[i])
 	continue;
 
-      FOR_EACH_VEC_ELT (cgraph_edge_p, callers, j, cs)
+      FOR_EACH_VEC_ELT (callers, j, cs)
 	{
 	  struct ipa_jump_func *jump_func;
 	  tree t;
@@ -2729,7 +2720,7 @@ find_more_scalar_values_for_callers_subset (struct cgraph_node *node,
 	      fprintf (dump_file, "\n");
 	    }
 
-	  VEC_replace (tree, known_vals, i, newval);
+	  known_vals[i] = newval;
 	}
     }
 }
@@ -2737,13 +2728,13 @@ find_more_scalar_values_for_callers_subset (struct cgraph_node *node,
 /* Go through PLATS and create a vector of values consisting of values and
    offsets (minus OFFSET) of lattices that contain only a single value.  */
 
-static VEC (ipa_agg_jf_item_t, heap) *
+static vec<ipa_agg_jf_item_t>
 copy_plats_to_inter (struct ipcp_param_lattices *plats, HOST_WIDE_INT offset)
 {
-  VEC (ipa_agg_jf_item_t, heap) *res = NULL;
+  vec<ipa_agg_jf_item_t> res = vec<ipa_agg_jf_item_t>();
 
   if (!plats->aggs || plats->aggs_contain_variable || plats->aggs_bottom)
-    return NULL;
+    return vec<ipa_agg_jf_item>();
 
   for (struct ipcp_agg_lattice *aglat = plats->aggs; aglat; aglat = aglat->next)
     if (ipa_lat_is_single_const (aglat))
@@ -2751,7 +2742,7 @@ copy_plats_to_inter (struct ipcp_param_lattices *plats, HOST_WIDE_INT offset)
 	struct ipa_agg_jf_item ti;
 	ti.offset = aglat->offset - offset;
 	ti.value = aglat->values->value;
-	VEC_safe_push (ipa_agg_jf_item_t, heap, res, ti);
+	res.safe_push (ti);
       }
   return res;
 }
@@ -2761,7 +2752,7 @@ copy_plats_to_inter (struct ipcp_param_lattices *plats, HOST_WIDE_INT offset)
 
 static void
 intersect_with_plats (struct ipcp_param_lattices *plats,
-		      VEC (ipa_agg_jf_item_t, heap) **inter,
+		      vec<ipa_agg_jf_item_t> *inter,
 		      HOST_WIDE_INT offset)
 {
   struct ipcp_agg_lattice *aglat;
@@ -2770,13 +2761,12 @@ intersect_with_plats (struct ipcp_param_lattices *plats,
 
   if (!plats->aggs || plats->aggs_contain_variable || plats->aggs_bottom)
     {
-      VEC_free (ipa_agg_jf_item_t, heap, *inter);
-      *inter = NULL;
+      inter->release ();
       return;
     }
 
   aglat = plats->aggs;
-  FOR_EACH_VEC_ELT (ipa_agg_jf_item_t, *inter, k, item)
+  FOR_EACH_VEC_ELT (*inter, k, item)
     {
       bool found = false;
       if (!item->value)
@@ -2802,11 +2792,11 @@ intersect_with_plats (struct ipcp_param_lattices *plats,
 /* Copy agggregate replacement values of NODE (which is an IPA-CP clone) to the
    vector result while subtracting OFFSET from the individual value offsets.  */
 
-static VEC (ipa_agg_jf_item_t, heap) *
+static vec<ipa_agg_jf_item_t>
 agg_replacements_to_vector (struct cgraph_node *node, HOST_WIDE_INT offset)
 {
   struct ipa_agg_replacement_value *av;
-  VEC (ipa_agg_jf_item_t, heap) *res = NULL;
+  vec<ipa_agg_jf_item_t> res = vec<ipa_agg_jf_item_t>();
 
   for (av = ipa_get_agg_replacements_for_node (node); av; av = av->next)
     {
@@ -2814,7 +2804,7 @@ agg_replacements_to_vector (struct cgraph_node *node, HOST_WIDE_INT offset)
       gcc_checking_assert (av->value);
       item.offset = av->offset - offset;
       item.value = av->value;
-      VEC_safe_push (ipa_agg_jf_item_t, heap, res, item);
+      res.safe_push (item);
     }
 
   return res;
@@ -2826,7 +2816,7 @@ agg_replacements_to_vector (struct cgraph_node *node, HOST_WIDE_INT offset)
 
 static void
 intersect_with_agg_replacements (struct cgraph_node *node, int index,
-				 VEC (ipa_agg_jf_item_t, heap) **inter,
+				 vec<ipa_agg_jf_item_t> *inter,
 				 HOST_WIDE_INT offset)
 {
   struct ipa_agg_replacement_value *srcvals;
@@ -2836,12 +2826,11 @@ intersect_with_agg_replacements (struct cgraph_node *node, int index,
   srcvals = ipa_get_agg_replacements_for_node (node);
   if (!srcvals)
     {
-      VEC_free (ipa_agg_jf_item_t, heap, *inter);
-      *inter = NULL;
+      inter->release ();
       return;
     }
 
-  FOR_EACH_VEC_ELT (ipa_agg_jf_item_t, *inter, i, item)
+  FOR_EACH_VEC_ELT (*inter, i, item)
     {
       struct ipa_agg_replacement_value *av;
       bool found = false;
@@ -2868,14 +2857,14 @@ intersect_with_agg_replacements (struct cgraph_node *node, int index,
 
 static struct ipa_agg_replacement_value *
 find_aggregate_values_for_callers_subset (struct cgraph_node *node,
-					  VEC (cgraph_edge_p,heap) *callers)
+					  vec<cgraph_edge_p> callers)
 {
   struct ipa_node_params *info = IPA_NODE_REF (node);
   struct ipa_agg_replacement_value *res = NULL;
   struct cgraph_edge *cs;
   int i, j, count = ipa_get_param_count (info);
 
-  FOR_EACH_VEC_ELT (cgraph_edge_p, callers, j, cs)
+  FOR_EACH_VEC_ELT (callers, j, cs)
     {
       int c = ipa_get_cs_argument_count (IPA_EDGE_REF (cs));
       if (c < count)
@@ -2885,7 +2874,7 @@ find_aggregate_values_for_callers_subset (struct cgraph_node *node,
   for (i = 0; i < count ; i++)
     {
       struct cgraph_edge *cs;
-      VEC (ipa_agg_jf_item_t, heap) *inter = NULL;
+      vec<ipa_agg_jf_item_t> inter = vec<ipa_agg_jf_item_t>();
       struct ipa_agg_jf_item *item;
       int j;
 
@@ -2894,7 +2883,7 @@ find_aggregate_values_for_callers_subset (struct cgraph_node *node,
       if (ipa_get_parm_lattices (info, i)->aggs_bottom)
 	continue;
 
-      FOR_EACH_VEC_ELT (cgraph_edge_p, callers, j, cs)
+      FOR_EACH_VEC_ELT (callers, j, cs)
 	{
 	  struct ipa_jump_func *jfunc;
 	  jfunc = ipa_get_ith_jump_func (IPA_EDGE_REF (cs), i);
@@ -2912,7 +2901,7 @@ find_aggregate_values_for_callers_subset (struct cgraph_node *node,
 						      src_idx);
 		  if (agg_pass_through_permissible_p (orig_plats, jfunc))
 		    {
-		      if (!inter)
+		      if (!inter.exists ())
 			inter = agg_replacements_to_vector (cs->caller, 0);
 		      else
 			intersect_with_agg_replacements (cs->caller, src_idx,
@@ -2928,7 +2917,7 @@ find_aggregate_values_for_callers_subset (struct cgraph_node *node,
 		      /* Currently we do not produce clobber aggregate jump
 			 functions, adjust when we do.  */
 		      gcc_checking_assert (!jfunc->agg.items);
-		      if (!inter)
+		      if (!inter.exists ())
 			inter = copy_plats_to_inter (src_plats, 0);
 		      else
 			intersect_with_plats (src_plats, &inter, 0);
@@ -2945,7 +2934,7 @@ find_aggregate_values_for_callers_subset (struct cgraph_node *node,
 
 	      if (info->ipcp_orig_node)
 		{
-		  if (!inter)
+		  if (!inter.exists ())
 		    inter = agg_replacements_to_vector (cs->caller, delta);
 		  else
 		    intersect_with_agg_replacements (cs->caller, i, &inter,
@@ -2957,7 +2946,7 @@ find_aggregate_values_for_callers_subset (struct cgraph_node *node,
 		  /* Currently we do not produce clobber aggregate jump
 		     functions, adjust when we do.  */
 		  gcc_checking_assert (!src_plats->aggs || !jfunc->agg.items);
-		  if (!inter)
+		  if (!inter.exists ())
 		    inter = copy_plats_to_inter (src_plats, delta);
 		  else
 		    intersect_with_plats (src_plats, &inter, delta);
@@ -2967,10 +2956,11 @@ find_aggregate_values_for_callers_subset (struct cgraph_node *node,
 	    {
 	      int k;
 
-	      if (!inter)
-		inter = VEC_copy (ipa_agg_jf_item, heap, jfunc->agg.items);
+	      if (!inter.exists ())
+		for (unsigned i = 0; i < jfunc->agg.items->length (); i++)
+		  inter.safe_push ((*jfunc->agg.items)[i]);
 	      else
-		FOR_EACH_VEC_ELT (ipa_agg_jf_item_t, inter, k, item)
+		FOR_EACH_VEC_ELT (inter, k, item)
 		  {
 		    int l = 0;
 		    bool found = false;;
@@ -2978,12 +2968,10 @@ find_aggregate_values_for_callers_subset (struct cgraph_node *node,
 		    if (!item->value)
 		      continue;
 
-		    while ((unsigned) l < VEC_length (ipa_agg_jf_item_t,
-						      jfunc->agg.items))
+		    while ((unsigned) l < jfunc->agg.items->length ())
 		      {
 			struct ipa_agg_jf_item *ti;
-		        ti = &VEC_index (ipa_agg_jf_item_t,
-					 jfunc->agg.items, l);
+		        ti = &(*jfunc->agg.items)[l];
 			if (ti->offset > item->offset)
 			  break;
 			if (ti->offset == item->offset)
@@ -3003,11 +2991,11 @@ find_aggregate_values_for_callers_subset (struct cgraph_node *node,
 	  else
 	    goto next_param;
 
-	  if (!inter)
+	  if (!inter.exists ())
 	    goto next_param;
 	}
 
-      FOR_EACH_VEC_ELT (ipa_agg_jf_item_t, inter, j, item)
+      FOR_EACH_VEC_ELT (inter, j, item)
 	{
 	  struct ipa_agg_replacement_value *v;
 
@@ -3023,8 +3011,8 @@ find_aggregate_values_for_callers_subset (struct cgraph_node *node,
 	}
 
     next_param:
-      if (inter)
-	VEC_free (ipa_agg_jf_item, heap, inter);
+      if (inter.exists ())
+	inter.release ();
     }
   return res;
 }
@@ -3032,16 +3020,15 @@ find_aggregate_values_for_callers_subset (struct cgraph_node *node,
 /* Turn KNOWN_AGGS into a list of aggreate replacement values.  */
 
 static struct ipa_agg_replacement_value *
-known_aggs_to_agg_replacement_list (VEC (ipa_agg_jump_function_t,
-					 heap) *known_aggs)
+known_aggs_to_agg_replacement_list (vec<ipa_agg_jump_function_t> known_aggs)
 {
   struct ipa_agg_replacement_value *res = NULL;
   struct ipa_agg_jump_function *aggjf;
   struct ipa_agg_jf_item *item;
   int i, j;
 
-  FOR_EACH_VEC_ELT (ipa_agg_jump_function_t, known_aggs, i, aggjf)
-    FOR_EACH_VEC_ELT (ipa_agg_jf_item_t, aggjf->items, j, item)
+  FOR_EACH_VEC_ELT (known_aggs, i, aggjf)
+    FOR_EACH_VEC_SAFE_ELT (aggjf->items, j, item)
       {
 	struct ipa_agg_replacement_value *v;
 	v = ggc_alloc_ipa_agg_replacement_value ();
@@ -3074,7 +3061,7 @@ cgraph_edge_brings_all_scalars_for_node (struct cgraph_edge *cs,
       struct ipa_jump_func *jump_func;
       tree val, t;
 
-      val = VEC_index (tree, dest_info->known_vals, i);
+      val = dest_info->known_vals[i];
       if (!val)
 	continue;
 
@@ -3180,15 +3167,15 @@ perhaps_add_new_callers (struct cgraph_node *node, struct ipcp_value *val)
 /* Copy KNOWN_BINFOS to KNOWN_VALS.  */
 
 static void
-move_binfos_to_values (VEC (tree, heap) *known_vals,
-		       VEC (tree, heap) *known_binfos)
+move_binfos_to_values (vec<tree> known_vals,
+		       vec<tree> known_binfos)
 {
   tree t;
   int i;
 
-  for (i = 0; VEC_iterate (tree, known_binfos, i, t); i++)
+  for (i = 0; known_binfos.iterate (i, &t); i++)
     if (t)
-      VEC_replace (tree, known_vals, i, t);
+      known_vals[i] = t;
 }
 
 /* Return true if there is a replacement equivalent to VALUE, INDEX and OFFSET
@@ -3216,14 +3203,14 @@ ipcp_val_in_agg_replacements_p (struct ipa_agg_replacement_value *aggvals,
 
 static bool
 decide_about_value (struct cgraph_node *node, int index, HOST_WIDE_INT offset,
-		    struct ipcp_value *val, VEC (tree, heap) *known_csts,
-		    VEC (tree, heap) *known_binfos)
+		    struct ipcp_value *val, vec<tree> known_csts,
+		    vec<tree> known_binfos)
 {
   struct ipa_agg_replacement_value *aggvals;
   int freq_sum, caller_count;
   gcov_type count_sum;
-  VEC (cgraph_edge_p, heap) *callers;
-  VEC (tree, heap) *kv;
+  vec<cgraph_edge_p> callers;
+  vec<tree> kv;
 
   if (val->spec_node)
     {
@@ -3270,10 +3257,10 @@ decide_about_value (struct cgraph_node *node, int index, HOST_WIDE_INT offset,
 	     cgraph_node_name (node), node->uid);
 
   callers = gather_edges_for_value (val, caller_count);
-  kv = VEC_copy (tree, heap, known_csts);
+  kv = known_csts.copy ();
   move_binfos_to_values (kv, known_binfos);
   if (offset == -1)
-    VEC_replace (tree, kv, index, val->value);
+    kv[index] = val->value;
   find_more_scalar_values_for_callers_subset (node, kv, callers);
   aggvals = find_aggregate_values_for_callers_subset (node, callers);
   gcc_checking_assert (offset == -1
@@ -3295,8 +3282,8 @@ decide_whether_version_node (struct cgraph_node *node)
 {
   struct ipa_node_params *info = IPA_NODE_REF (node);
   int i, count = ipa_get_param_count (info);
-  VEC (tree, heap) *known_csts, *known_binfos;
-  VEC (ipa_agg_jump_function_t, heap) *known_aggs = NULL;
+  vec<tree> known_csts, known_binfos;
+  vec<ipa_agg_jump_function_t> known_aggs = vec<ipa_agg_jump_function_t>();
   bool ret = false;
 
   if (count == 0)
@@ -3317,8 +3304,8 @@ decide_whether_version_node (struct cgraph_node *node)
       struct ipcp_value *val;
 
       if (!lat->bottom
-	  && !VEC_index (tree, known_csts, i)
-	  && !VEC_index (tree, known_binfos, i))
+	  && !known_csts[i]
+	  && !known_binfos[i])
 	for (val = lat->values; val; val = val->next)
 	  ret |= decide_about_value (node, i, -1, val, known_csts,
 				     known_binfos);
@@ -3342,7 +3329,7 @@ decide_whether_version_node (struct cgraph_node *node)
 
   if (info->clone_for_all_contexts)
     {
-      VEC (cgraph_edge_p, heap) *callers;
+      vec<cgraph_edge_p> callers;
 
       if (dump_file)
 	fprintf (dump_file, " - Creating a specialized node of %s/%i "
@@ -3359,9 +3346,9 @@ decide_whether_version_node (struct cgraph_node *node)
       ret = true;
     }
   else
-    VEC_free (tree, heap, known_csts);
+    known_csts.release ();
 
-  VEC_free (tree, heap, known_binfos);
+  known_binfos.release ();
   return ret;
 }
 
@@ -3507,7 +3494,7 @@ ipcp_driver (void)
 
   /* Free all IPCP structures.  */
   free_toporder_info (&topo);
-  VEC_free (cgraph_edge_p, heap, next_edge_clone);
+  next_edge_clone.release ();
   cgraph_remove_edge_duplication_hook (edge_duplication_hook_holder);
   ipa_free_all_structures_after_ipa_cp ();
   if (dump_file)