Re-implement VEC_* to be member functions of vec_t<T>

diff --git a/gcc/vec.h b/gcc/vec.h
index 1922616..74a85c7 100644
--- a/gcc/vec.h
+++ b/gcc/vec.h
@@ -25,26 +25,34 @@  along with GCC; see the file COPYING3.  If not see
 
 #include "statistics.h"		/* For MEM_STAT_DECL.  */
 
-/* The macros here implement a set of templated vector types and
-   associated interfaces.  These templates are implemented with
-   macros, as we're not in C++ land.  The interface functions are
-   typesafe and use static inline functions, sometimes backed by
-   out-of-line generic functions.  The vectors are designed to
-   interoperate with the GTY machinery.
-
-   Because of the different behavior of structure objects, scalar
-   objects and of pointers, there are three flavors, one for each of
-   these variants.  Both the structure object and pointer variants
-   pass pointers to objects around -- in the former case the pointers
-   are stored into the vector and in the latter case the pointers are
-   dereferenced and the objects copied into the vector.  The scalar
-   object variant is suitable for int-like objects, and the vector
-   elements are returned by value.
-
-   There are both 'index' and 'iterate' accessors.  The iterator
-   returns a boolean iteration condition and updates the iteration
-   variable passed by reference.  Because the iterator will be
-   inlined, the address-of can be optimized away.
+/* Templated vector type and associated interfaces.
+
+   The interface functions are typesafe and use inline functions,
+   sometimes backed by out-of-line generic functions.  The vectors are
+   designed to interoperate with the GTY machinery.
+
+   FIXME - Remove the following compatibility notes after a handler
+   class for vec_t is implemented.
+
+   To preserve compatibility with the existing API, some functions
+   that manipulate vector elements implement two overloads: one taking
+   a pointer to the element and others that take a pointer to a
+   pointer to the element.
+
+   This used to be implemented with three different families of macros
+   and structures: structure objects, scalar objects and of pointers.
+   Both the structure object and pointer variants passed pointers to
+   objects around -- in the former case the pointers were stored into
+   the vector and in the latter case the pointers were dereferenced and
+   the objects copied into the vector.  The scalar object variant was
+   suitable for int-like objects, and the vector elements were returned
+   by value.
+
+   There are both 'index' and 'iterate' accessors.  The index accessor
+   is implemented by operator[].  The iterator returns a boolean
+   iteration condition and updates the iteration variable passed by
+   reference.  Because the iterator will be inlined, the address-of
+   can be optimized away.
 
    The vectors are implemented using the trailing array idiom, thus
    they are not resizeable without changing the address of the vector
@@ -87,43 +95,27 @@  along with GCC; see the file COPYING3.  If not see
    When a vector type is defined, first a non-memory managed version
    is created.  You can then define either or both garbage collected
    and heap allocated versions.  The allocation mechanism is specified
-   when the type is defined, and is therefore part of the type.  If
-   you need both gc'd and heap allocated versions, you still must have
-   *exactly* one definition of the common non-memory managed base vector.
+   when the vector is allocated.  This can occur via the VEC_alloc
+   call or one of the VEC_safe_* functions that add elements to a
+   vector.  If the vector is NULL, it will be allocated using the
+   allocation strategy selected in the call.  The valid allocations
+   are defined in enum vec_allocation_t.
 
    If you need to directly manipulate a vector, then the 'address'
    accessor will return the address of the start of the vector.  Also
    the 'space' predicate will tell you whether there is spare capacity
    in the vector.  You will not normally need to use these two functions.
 
-   Vector types are defined using a DEF_VEC_{O,A,P,I}(TYPEDEF) macro, to
-   get the non-memory allocation version, and then a
-   DEF_VEC_ALLOC_{O,A,P,I}(TYPEDEF,ALLOC) macro to get memory managed
-   vectors.  Variables of vector type are declared using a
-   VEC(TYPEDEF,ALLOC) macro.  The ALLOC argument specifies the
-   allocation strategy, and can be either 'gc' or 'heap' for garbage
-   collected and heap allocated respectively.  It can be 'none' to get
-   a vector that must be explicitly allocated (for instance as a
-   trailing array of another structure).  The characters O, A, P and I
-   indicate whether TYPEDEF is a pointer (P), object (O), atomic object
-   (A) or integral (I) type.  Be careful to pick the correct one, as
-   you'll get an awkward and inefficient API if you use the wrong one or
-   a even a crash if you pick the atomic object version when the object
-   version should have been chosen instead.  There is a check, which
-   results in a compile-time warning, for the P and I versions, but there
-   is no check for the O versions, as that is not possible in plain C.
-   Due to the way GTY works, you must annotate any structures you wish to
-   insert or reference from a vector with a GTY(()) tag.  You need to do
-   this even if you never declare the GC allocated variants.
+   Variables of vector type are of type vec_t<ETYPE> where ETYPE is
+   the type of the elements of the vector. Due to the way GTY works,
+   you must annotate any structures you wish to insert or reference
+   from a vector with a GTY(()) tag.  You need to do this even if you
+   never use the GC allocated variants.
 
    An example of their use would be,
 
-   DEF_VEC_P(tree);   // non-managed tree vector.
-   DEF_VEC_ALLOC_P(tree,gc);	// gc'd vector of tree pointers.  This must
-   			        // appear at file scope.
-
    struct my_struct {
-     VEC(tree,gc) *v;      // A (pointer to) a vector of tree pointers.
+     vec_t<tree> *v;      // A (pointer to) a vector of tree pointers.
    };
 
    struct my_struct *s;
@@ -136,9 +128,12 @@  along with GCC; see the file COPYING3.  If not see
 */
 
 #if ENABLE_CHECKING
-#define VEC_CHECK_INFO ,__FILE__,__LINE__,__FUNCTION__
-#define VEC_CHECK_DECL ,const char *file_,unsigned line_,const char *function_
-#define VEC_CHECK_PASS ,file_,line_,function_
+#define ALONE_VEC_CHECK_INFO __FILE__, __LINE__, __FUNCTION__
+#define VEC_CHECK_INFO , ALONE_VEC_CHECK_INFO
+#define ALONE_VEC_CHECK_DECL const char *file_, unsigned line_, const char *function_
+#define VEC_CHECK_DECL , ALONE_VEC_CHECK_DECL
+#define ALONE_VEC_CHECK_PASS file_, line_, function_
+#define VEC_CHECK_PASS , ALONE_VEC_CHECK_PASS
 
 #define VEC_ASSERT(EXPR,OP,T,A) \
   (void)((EXPR) ? 0 : (VEC_ASSERT_FAIL(OP,VEC(T,A)), 0))
@@ -147,8 +142,11 @@  extern void vec_assert_fail (const char *, const char * VEC_CHECK_DECL)
      ATTRIBUTE_NORETURN;
 #define VEC_ASSERT_FAIL(OP,VEC) vec_assert_fail (OP,#VEC VEC_CHECK_PASS)
 #else
+#define ALONE_VEC_CHECK_INFO
 #define VEC_CHECK_INFO
+#define ALONE_VEC_CHECK_DECL void
 #define VEC_CHECK_DECL
+#define ALONE_VEC_CHECK_PASS
 #define VEC_CHECK_PASS
 #define VEC_ASSERT(EXPR,OP,T,A) (void)(EXPR)
 #endif
@@ -159,27 +157,106 @@  enum vec_allocation_t { heap, gc, stack };
 
 struct vec_prefix
 {
-  unsigned num;
-  unsigned alloc;
+  unsigned num_;
+  unsigned alloc_;
 };
 
 /* Vector type, user visible.  */
 template<typename T>
 struct GTY(()) vec_t
 {
-  vec_prefix prefix;
-  T vec[1];
+  unsigned length (void) const;
+  bool empty (void) const;
+  T *address (void);
+  T &last (ALONE_VEC_CHECK_DECL);
+  const T &operator[] (unsigned) const;
+  T &operator[] (unsigned);
+  void embedded_init (int, int);
+
+  template<enum vec_allocation_t A>
+  vec_t<T> *copy (ALONE_MEM_STAT_DECL);
+
+  bool space (int VEC_CHECK_DECL);
+  void splice (vec_t<T> * VEC_CHECK_DECL);
+  T &quick_push (T VEC_CHECK_DECL);
+  T *quick_push (const T * VEC_CHECK_DECL);
+  T &pop (ALONE_VEC_CHECK_DECL);
+  void truncate (unsigned VEC_CHECK_DECL);
+  void replace (unsigned, T VEC_CHECK_DECL);
+  void quick_insert (unsigned, T VEC_CHECK_DECL);
+  void quick_insert (unsigned, const T * VEC_CHECK_DECL);
+  void ordered_remove (unsigned VEC_CHECK_DECL);
+  void unordered_remove (unsigned VEC_CHECK_DECL);
+  void block_remove (unsigned, unsigned VEC_CHECK_DECL);
+
+  unsigned lower_bound (T, bool (*)(T, T)) const;
+  unsigned lower_bound (const T *, bool (*)(const T *, const T *)) const;
+
+  /* Class-static member functions.  Some of these will become member
+     functions of a future handler class wrapping vec_t.  */
+  static size_t embedded_size (int);
+
+  template<enum vec_allocation_t A>
+  static vec_t<T> *alloc (int MEM_STAT_DECL);
+
+  static vec_t<T> *alloc (int, vec_t<T> *);
+
+  template<enum vec_allocation_t A>
+  static void free (vec_t<T> **);
+
+  template<enum vec_allocation_t A>
+  static vec_t<T> *reserve_exact (vec_t<T> *, int MEM_STAT_DECL);
+
+  template<enum vec_allocation_t A>
+  static bool reserve_exact (vec_t<T> **, int VEC_CHECK_DECL MEM_STAT_DECL);
+
+  template<enum vec_allocation_t A>
+  static vec_t<T> *reserve (vec_t<T> *, int MEM_STAT_DECL);
+
+  template<enum vec_allocation_t A>
+  static bool reserve (vec_t<T> **, int VEC_CHECK_DECL MEM_STAT_DECL);
+
+  template<enum vec_allocation_t A>
+  static void safe_splice (vec_t<T> **, vec_t<T> * VEC_CHECK_DECL
+			   MEM_STAT_DECL);
+
+  template<enum vec_allocation_t A>
+  static T &safe_push (vec_t<T> **, T VEC_CHECK_DECL MEM_STAT_DECL);
+
+  template<enum vec_allocation_t A>
+  static T *safe_push (vec_t<T> **, const T * VEC_CHECK_DECL MEM_STAT_DECL);
+
+  template<enum vec_allocation_t A>
+  static void safe_grow (vec_t<T> **, int VEC_CHECK_DECL MEM_STAT_DECL);
+
+  template<enum vec_allocation_t A>
+  static void safe_grow_cleared (vec_t<T> **, int VEC_CHECK_DECL MEM_STAT_DECL);
+
+  template<enum vec_allocation_t A>
+  static void safe_insert (vec_t<T> **, unsigned, T * VEC_CHECK_DECL
+			   MEM_STAT_DECL);
+
+  template<enum vec_allocation_t A>
+  static void safe_insert (vec_t<T> **, unsigned, T obj VEC_CHECK_DECL
+			   MEM_STAT_DECL);
+
+  static bool iterate (const vec_t<T> *, unsigned, T *);
+  static bool iterate (const vec_t<T> *, unsigned, T **);
+
+  vec_prefix prefix_;
+  T vec_[1];
 };
 
+
 /* Garbage collection support for vec_t.  */
 
 template<typename T>
 void
 gt_ggc_mx (vec_t<T> *v)
 {
-  extern void gt_ggc_mx (T&);
-  for (unsigned i = 0; i < v->prefix.num; i++)
-    gt_ggc_mx (v->vec[i]);
+  extern void gt_ggc_mx (T &);
+  for (unsigned i = 0; i < v->length (); i++)
+    gt_ggc_mx ((*v)[i]);
 }
 
 
@@ -189,17 +266,17 @@  template<typename T>
 void
 gt_pch_nx (vec_t<T> *v)
 {
-  extern void gt_pch_nx (T&);
-  for (unsigned i = 0; i < v->prefix.num; i++)
-    gt_pch_nx (v->vec[i]);
+  extern void gt_pch_nx (T &);
+  for (unsigned i = 0; i < v->length (); i++)
+    gt_pch_nx ((*v)[i]);
 }
 
 template<typename T>
 void
 gt_pch_nx (vec_t<T *> *v, gt_pointer_operator op, void *cookie)
 {
-  for (unsigned i = 0; i < v->prefix.num; i++)
-    op (&(v->vec[i]), cookie);
+  for (unsigned i = 0; i < v->length (); i++)
+    op (&((*v)[i]), cookie);
 }
 
 template<typename T>
@@ -207,13 +284,14 @@  void
 gt_pch_nx (vec_t<T> *v, gt_pointer_operator op, void *cookie)
 {
   extern void gt_pch_nx (T *, gt_pointer_operator, void *);
-  for (unsigned i = 0; i < v->prefix.num; i++)
-    gt_pch_nx (&(v->vec[i]), op, cookie);
+  for (unsigned i = 0; i < v->length (); i++)
+    gt_pch_nx (&((*v)[i]), op, cookie);
 }
 
 
-/* FIXME cxx-conversion.  Remove these definitions and update all
-   calling sites.  */
+/* FIXME.  Remove these definitions and update all calling sites after
+   the handler class for vec_t is implemented.  */
+
 /* Vector of integer-like object.  */
 #define DEF_VEC_I(T)			struct vec_swallow_trailing_semi
 #define DEF_VEC_ALLOC_I(T,A)		struct vec_swallow_trailing_semi
@@ -270,138 +348,194 @@  extern void *vec_stack_o_reserve_exact (void *, int, size_t, size_t
 					 MEM_STAT_DECL);
 extern void vec_stack_free (void *);
 
-/* Reallocate an array of elements with prefix.  */
-template<typename T, enum vec_allocation_t A>
-extern vec_t<T> *vec_reserve (vec_t<T> *, int MEM_STAT_DECL);
-
-template<typename T, enum vec_allocation_t A>
-extern vec_t<T> *vec_reserve_exact (vec_t<T> *, int MEM_STAT_DECL);
-
 extern void dump_vec_loc_statistics (void);
 extern void ggc_free (void *);
 extern void vec_heap_free (void *);
 
 
-/* Macros to invoke API calls.  A single macro works for both pointer
-   and object vectors, but the argument and return types might well be
-   different.  In each macro, T is the typedef of the vector elements,
-   and A is the allocation strategy.  The allocation strategy is only
-   present when it is required.  Some of these macros pass the vector,
-   V, by reference (by taking its address), this is noted in the
-   descriptions.  */
+/* API compatibility macros (to be removed).  */
+#define VEC_length(T,V)							\
+	((V) ? (V)->length () : 0)
 
-/* Length of vector
-   unsigned VEC_T_length(const VEC(T) *v);
+#define VEC_empty(T,V)							\
+	((V) ? (V)->empty () : true)
 
-   Return the number of active elements in V.  V can be NULL, in which
-   case zero is returned.  */
+#define VEC_address(T,V)						\
+	vec_address<T> (V)
 
-#define VEC_length(T,V)	(VEC_length_1<T> (V))
+/* FIXME.  For now, we need to continue expanding VEC_address into a
+   function call.  Otherwise, the warning machinery for -Wnonnull gets
+   confused thinking that VEC_address may return null in calls to
+   memcpy and qsort.  This will disappear once vec_address becomes
+   a member function for a handler class wrapping vec_t.  */
 
 template<typename T>
-static inline unsigned
-VEC_length_1 (const vec_t<T> *vec_)
+static inline T *
+vec_address (vec_t<T> *vec)
 {
-  return vec_ ? vec_->prefix.num : 0;
+  return vec ? vec->address() : NULL;
 }
 
+#define VEC_last(T,V)							\
+	((V)->last (ALONE_VEC_CHECK_INFO))
 
-/* Check if vector is empty
-   int VEC_T_empty(const VEC(T) *v);
+#define VEC_index(T,V,I)						\
+	((*(V))[I])
 
-   Return nonzero if V is an empty vector (or V is NULL), zero otherwise.  */
+#define VEC_iterate(T,V,I,P)						\
+	(vec_t<T>::iterate(V, I, &(P)))
 
-#define VEC_empty(T,V)	(VEC_empty_1<T> (V))
+#define VEC_embedded_size(T,N)						\
+	(vec_t<T>::embedded_size (N))
 
-template<typename T>
-static inline bool
-VEC_empty_1 (const vec_t<T> *vec_)
-{
-  return VEC_length (T, vec_) == 0;
-}
+#define VEC_embedded_init(T,V,N)					\
+	((V)->embedded_init (N))
+
+#define VEC_free(T,A,V)							\
+	(vec_t<T>::free<A> (&(V)))
+
+#define VEC_copy(T,A,V)							\
+	((V)->copy<A> (ALONE_MEM_STAT_INFO))
+
+#define VEC_space(T,V,R)						\
+	((V) ? (V)->space (R VEC_CHECK_INFO) : (R) == 0)
+
+#define VEC_reserve(T,A,V,R)						\
+	(vec_t<T>::reserve<A> (&(V), (int)(R) VEC_CHECK_INFO MEM_STAT_INFO))
+
+#define VEC_reserve_exact(T,A,V,R)					\
+	(vec_t<T>::reserve_exact<A> (&(V), R VEC_CHECK_INFO MEM_STAT_INFO))
+
+#define VEC_splice(T,DST,SRC)	        				\
+	(DST)->splice (SRC VEC_CHECK_INFO)
+
+#define VEC_safe_splice(T,A,DST,SRC)					\
+	 vec_t<T>::safe_splice<A> (&(DST), SRC VEC_CHECK_INFO MEM_STAT_INFO)
+
+#define VEC_quick_push(T,V,O)						\
+	((V)->quick_push (O VEC_CHECK_INFO))
+
+#define VEC_safe_push(T,A,V,O)						\
+	(vec_t<T>::safe_push<A> (&(V), O VEC_CHECK_INFO MEM_STAT_INFO))
+
+#define VEC_pop(T,V)							\
+	((V)->pop (ALONE_VEC_CHECK_INFO))
+
+#define VEC_truncate(T,V,I)						\
+	(V								\
+	 ? (V)->truncate ((unsigned)(I) VEC_CHECK_INFO)			\
+	 : gcc_assert ((I) == 0))
+
+#define VEC_safe_grow(T,A,V,I)						\
+	(vec_t<T>::safe_grow<A> (&(V), (int)(I) VEC_CHECK_INFO MEM_STAT_INFO))
+
+#define VEC_safe_grow_cleared(T,A,V,I)					\
+	(vec_t<T>::safe_grow_cleared<A> (&(V), (int)(I)			\
+				         VEC_CHECK_INFO MEM_STAT_INFO))
+
+#define VEC_replace(T,V,I,O)						\
+	((V)->replace ((unsigned)(I), O VEC_CHECK_INFO))
+
+#define VEC_quick_insert(T,V,I,O)					\
+	((V)->quick_insert (I,O VEC_CHECK_INFO))
+
+#define VEC_safe_insert(T,A,V,I,O)					\
+	(vec_t<T>::safe_insert<A> (&(V), I, O VEC_CHECK_INFO MEM_STAT_INFO))
 
+#define VEC_ordered_remove(T,V,I)					\
+	((V)->ordered_remove (I VEC_CHECK_INFO))
 
-/* Get the address of the array of elements
-   T *VEC_T_address (VEC(T) v)
+#define VEC_unordered_remove(T,V,I)					\
+	((V)->unordered_remove (I VEC_CHECK_INFO))
 
-   If you need to directly manipulate the array (for instance, you
-   want to feed it to qsort), use this accessor.  */
+#define VEC_block_remove(T,V,I,L)					\
+	((V)->block_remove (I, L VEC_CHECK_INFO))
 
-#define VEC_address(T,V)	(VEC_address_1<T> (V))
+#define VEC_lower_bound(T,V,O,LT)					\
+	((V)->lower_bound (O, LT))
+
+
+/* Return the number of active elements in this vector.  */
 
 template<typename T>
-static inline T *
-VEC_address_1 (vec_t<T> *vec_)
+inline unsigned
+vec_t<T>::length (void) const
 {
-  return vec_ ? vec_->vec : 0;
+  return prefix_.num_;
 }
 
 
-/* Get the final element of the vector.
-   T VEC_T_last(VEC(T) *v); // Integer
-   T VEC_T_last(VEC(T) *v); // Pointer
-   T *VEC_T_last(VEC(T) *v); // Object
+/* Return true if this vector has no active elements.  */
+
+template<typename T>
+inline bool
+vec_t<T>::empty (void) const
+{
+  return length () == 0;
+}
 
-   Return the final element.  V must not be empty.  */
 
-#define VEC_last(T,V)	(VEC_last_1<T> (V VEC_CHECK_INFO))
+/* Return the address of the array of elements.  If you need to
+   directly manipulate the array (for instance, you want to feed it
+   to qsort), use this accessor.  */
 
 template<typename T>
-static inline T&
-VEC_last_1 (vec_t<T> *vec_ VEC_CHECK_DECL)
+inline T *
+vec_t<T>::address (void)
 {
-  VEC_ASSERT (vec_ && vec_->prefix.num, "last", T, base);
-  return vec_->vec[vec_->prefix.num - 1];
+  return vec_;
 }
 
 
-/* Index into vector
-   T VEC_T_index(VEC(T) *v, unsigned ix); // Integer
-   T VEC_T_index(VEC(T) *v, unsigned ix); // Pointer
-   T *VEC_T_index(VEC(T) *v, unsigned ix); // Object
+/* Get the final element of the vector, which must not be empty.  */
+
+template<typename T>
+T &
+vec_t<T>::last (ALONE_VEC_CHECK_DECL)
+{
+  VEC_ASSERT (prefix_.num_, "last", T, base);
+  return (*this)[prefix_.num_ - 1];
+}
 
-   Return the IX'th element.  IX must be in the domain of V.  */
 
-#define VEC_index(T,V,I) (VEC_index_1<T> (V, I VEC_CHECK_INFO))
+/* Index into vector.  Return the IX'th element.  IX must be in the
+   domain of the vector.  */
 
 template<typename T>
-static inline T&
-VEC_index_1 (vec_t<T> *vec_, unsigned ix_ VEC_CHECK_DECL)
+const T &
+vec_t<T>::operator[] (unsigned ix) const
 {
-  VEC_ASSERT (vec_ && ix_ < vec_->prefix.num, "index", T, base);
-  return vec_->vec[ix_];
+  gcc_assert (ix < prefix_.num_);
+  return vec_[ix];
 }
 
 template<typename T>
-static inline const T&
-VEC_index_1 (const vec_t<T> *vec_, unsigned ix_ VEC_CHECK_DECL)
+T &
+vec_t<T>::operator[] (unsigned ix)
 {
-  VEC_ASSERT (vec_ && ix_ < vec_->prefix.num, "index", T, base);
-  return vec_->vec[ix_];
+  gcc_assert (ix < prefix_.num_);
+  return vec_[ix];
 }
 
 
-/* Iterate over vector
-   int VEC_T_iterate(VEC(T) *v, unsigned ix, T &ptr); // Integer
-   int VEC_T_iterate(VEC(T) *v, unsigned ix, T &ptr); // Pointer
-   int VEC_T_iterate(VEC(T) *v, unsigned ix, T *&ptr); // Object
-
-   Return iteration condition and update PTR to point to the IX'th
-   element.  At the end of iteration, sets PTR to NULL.  Use this to
-   iterate over the elements of a vector as follows,
+/* Return iteration condition and update PTR to point to the IX'th
+   element of VEC.  Use this to iterate over the elements of a vector
+   as follows,
 
-     for (ix = 0; VEC_iterate(T,v,ix,ptr); ix++)
-       continue;  */
-
-#define VEC_iterate(T,V,I,P)	(VEC_iterate_1<T> (V, I, &(P)))
+     for (ix = 0; vec_t<T>::iterate(v, ix, &ptr); ix++)
+       continue;
+   
+   FIXME.  This is a static member function because if VEC is NULL,
+   PTR should be initialized to NULL.  This will become a regular
+   member function of the handler class.  */
 
 template<typename T>
-static inline bool
-VEC_iterate_1 (const vec_t<T> *vec_, unsigned ix_, T *ptr)
+bool
+vec_t<T>::iterate (const vec_t<T> *vec, unsigned ix, T *ptr)
 {
-  if (vec_ && ix_ < vec_->prefix.num)
+  if (vec && ix < vec->prefix_.num_)
     {
-      *ptr = vec_->vec[ix_];
+      *ptr = vec->vec_[ix];
       return true;
     }
   else
@@ -411,13 +545,24 @@  VEC_iterate_1 (const vec_t<T> *vec_, unsigned ix_, T *ptr)
     }
 }
 
+
+/* Return iteration condition and update *PTR to point to the
+   IX'th element of VEC.  Use this to iterate over the elements of a
+   vector as follows,
+
+     for (ix = 0; v->iterate(ix, &ptr); ix++)
+       continue;
+
+   This variant is for vectors of objects.  FIXME, to be removed
+   once the distinction between vec_t<T> and vec_t<T *> disappears.  */
+
 template<typename T>
-static inline bool
-VEC_iterate_1 (vec_t<T> *vec_, unsigned ix_, T **ptr)
+bool
+vec_t<T>::iterate (const vec_t<T> *vec, unsigned ix, T **ptr)
 {
-  if (vec_ && ix_ < vec_->prefix.num)
+  if (vec && ix < vec->prefix_.num_)
     {
-      *ptr = &vec_->vec[ix_];
+      *ptr = CONST_CAST (T *, &vec->vec_[ix]);
       return true;
     }
   else
@@ -427,9 +572,10 @@  VEC_iterate_1 (vec_t<T> *vec_, unsigned ix_, T **ptr)
     }
 }
 
+
 /* Convenience macro for forward iteration.  */
 
-#define FOR_EACH_VEC_ELT(T, V, I, P)		\
+#define FOR_EACH_VEC_ELT(T, V, I, P)			\
   for (I = 0; VEC_iterate (T, (V), (I), (P)); ++(I))
 
 /* Likewise, but start from FROM rather than 0.  */
@@ -439,640 +585,517 @@  VEC_iterate_1 (vec_t<T> *vec_, unsigned ix_, T **ptr)
 
 /* Convenience macro for reverse iteration.  */
 
-#define FOR_EACH_VEC_ELT_REVERSE(T,V,I,P) \
-  for (I = VEC_length (T, (V)) - 1;           \
-       VEC_iterate (T, (V), (I), (P));	  \
+#define FOR_EACH_VEC_ELT_REVERSE(T, V, I, P)		\
+  for (I = VEC_length (T, (V)) - 1;			\
+       VEC_iterate (T, (V), (I), (P));			\
        (I)--)
 
 
-/* Use these to determine the required size and initialization of a
-   vector embedded within another structure (as the final member).
+/* Return the number of bytes needed to embed an instance of vec_t inside
+   another data structure.
 
-   size_t VEC_T_embedded_size(int reserve);
-   void VEC_T_embedded_init(VEC(T) *v, int reserve);
+   Use these methods to determine the required size and initialization
+   of a vector V of type T embedded within another structure (as the
+   final member):
 
-   These allow the caller to perform the memory allocation.  */
+   size_t vec_t<T>::embedded_size<T> (int reserve);
+   void v->embedded_init(int reserve, int active = 0);
 
-#define VEC_embedded_size(T,N)	 (VEC_embedded_size_1<T> (N))
+   These allow the caller to perform the memory allocation.  */
 
 template<typename T>
-static inline size_t
-VEC_embedded_size_1 (int alloc_)
+size_t
+vec_t<T>::embedded_size (int nelems)
 {
-  return offsetof (vec_t<T>, vec) + alloc_ * sizeof (T);
+  return offsetof (vec_t<T>, vec_) + nelems * sizeof (T);
 }
 
-#define VEC_embedded_init(T,O,N) (VEC_embedded_init_1<T> (O, N))
+
+/* Initialize the vector to contain room for NELEMS elements and
+   ACTIVE active elements.  */
 
 template<typename T>
-static inline void
-VEC_embedded_init_1 (vec_t<T> *vec_, int alloc_)
+void
+vec_t<T>::embedded_init (int nelems, int active = 0)
 {
-  vec_->prefix.num = 0;
-  vec_->prefix.alloc = alloc_;
+  prefix_.num_ = active;
+  prefix_.alloc_ = nelems;
 }
 
 
-/* Allocate new vector.
-   VEC(T,A) *VEC_T_A_alloc(int reserve);
-
-   Allocate a new vector with space for RESERVE objects.  If RESERVE
+/* Allocate a new vector with space for RESERVE objects.  If RESERVE
    is zero, NO vector is created.
 
+   Note that this allocator must always be a macro:
+
    We support a vector which starts out with space on the stack and
    switches to heap space when forced to reallocate.  This works a
-   little differently.  In the case of stack vectors, VEC_alloc will
-   expand to a call to VEC_alloc_1 that calls XALLOCAVAR to request the
+   little differently.  In the case of stack vectors, vec_alloc will
+   expand to a call to vec_alloc_1 that calls XALLOCAVAR to request the
    initial allocation.  This uses alloca to get the initial space.
    Since alloca can not be usefully called in an inline function,
-   VEC_alloc must always be a macro.
-
-   Only the initial allocation will be made using alloca, so pass a
-   reasonable estimate that doesn't use too much stack space; don't
-   pass zero.  Don't return a VEC(TYPE,stack) vector from the function
-   which allocated it.  */
-
-#define VEC_alloc(T,A,N)					\
-  ((A == stack)							\
-    ? VEC_alloc_1 (N,						\
- 		   XALLOCAVAR (vec_t<T>, 			\
-			       VEC_embedded_size_1<T> (N)))	\
-    : VEC_alloc_1<T, A> (N MEM_STAT_INFO))
-
-template<typename T, enum vec_allocation_t A>
-static inline vec_t<T> *
-VEC_alloc_1 (int alloc_ MEM_STAT_DECL)
+   vec_alloc must always be a macro.
+
+   Important limitations of stack vectors:
+
+   - Only the initial allocation will be made using alloca, so pass a
+     reasonable estimate that doesn't use too much stack space; don't
+     pass zero.
+
+   - Don't return a stack-allocated vector from the function which
+     allocated it.  */
+
+#define VEC_alloc(T,A,N)						\
+  ((A == stack)								\
+    ? vec_t<T>::alloc (N, XALLOCAVAR (vec_t<T>, vec_t<T>::embedded_size (N)))\
+    : vec_t<T>::alloc<A> (N MEM_STAT_INFO))
+
+template<typename T>
+template<enum vec_allocation_t A>
+vec_t<T> *
+vec_t<T>::alloc (int nelems MEM_STAT_DECL)
 {
-  return vec_reserve_exact<T, A> (NULL, alloc_ PASS_MEM_STAT);
+  return vec_t<T>::reserve_exact<A> ((vec_t<T> *) NULL, nelems PASS_MEM_STAT);
 }
 
 template<typename T>
-static inline vec_t<T> *
-VEC_alloc_1 (int alloc_, vec_t<T> *space)
+vec_t<T> *
+vec_t<T>::alloc (int nelems, vec_t<T> *space)
 {
-  return (vec_t<T> *) vec_stack_p_reserve_exact_1 (alloc_, space);
+  return static_cast <vec_t<T> *> (vec_stack_p_reserve_exact_1 (nelems, space));
 }
 
 
-/* Free a vector.
-   void VEC_T_A_free(VEC(T,A) *&);
-
-   Free a vector and set it to NULL.  */
-
-#define VEC_free(T,A,V)		(VEC_free_1<T, A> (&V))
+/* Free vector *V and set it to NULL.  */
 
-template<typename T, enum vec_allocation_t A>
-static inline void
-VEC_free_1 (vec_t<T> **vec_)
+template<typename T>
+template<enum vec_allocation_t A>
+void
+vec_t<T>::free (vec_t<T> **v)
 {
-  if (*vec_)
+  if (*v)
     {
       if (A == heap)
-	vec_heap_free (*vec_);
+	vec_heap_free (*v);
       else if (A == gc)
-	ggc_free (*vec_);
+	ggc_free (*v);
       else if (A == stack)
-	vec_stack_free (*vec_);
+	vec_stack_free (*v);
     }
-  *vec_ = NULL;
+  *v = NULL;
 }
 
 
-/* Copy a vector.
-   VEC(T,A) *VEC_T_A_copy(VEC(T) *);
-
-   Copy the live elements of a vector into a new vector.  The new and
-   old vectors need not be allocated by the same mechanism.  */
+/* Return a copy of this vector.  The new and old vectors need not be
+   allocated by the same mechanism.  */
 
-#define VEC_copy(T,A,V) (VEC_copy_1<T, A> (V MEM_STAT_INFO))
-
-template<typename T, enum vec_allocation_t A>
-static inline vec_t<T> *
-VEC_copy_1 (vec_t<T> *vec_ MEM_STAT_DECL)
+template<typename T>
+template<enum vec_allocation_t A>
+vec_t<T> *
+vec_t<T>::copy (ALONE_MEM_STAT_DECL)
 {
-  size_t len_ = vec_ ? vec_->prefix.num : 0;
-  vec_t<T> *new_vec_ = NULL;
+  unsigned len = VEC_length (T, this);
+  vec_t<T> *new_vec = NULL;
 
-  if (len_)
+  if (len)
     {
-      new_vec_ = vec_reserve_exact<T, A> (NULL, len_ PASS_MEM_STAT);
-      new_vec_->prefix.num = len_;
-      memcpy (new_vec_->vec, vec_->vec, sizeof (T) * len_);
+      new_vec = vec_t<T>::reserve_exact<A> (NULL, len PASS_MEM_STAT);
+      new_vec->embedded_init (len, len);
+      memcpy (new_vec->address (), vec_, sizeof (T) * len);
     }
-  return new_vec_;
-}
-
 
-/* Determine if a vector has additional capacity.
+  return new_vec;
+}
 
-   int VEC_T_space (VEC(T) *v,int reserve)
 
-   If V has space for RESERVE additional entries, return nonzero.  You
-   usually only need to use this if you are doing your own vector
-   reallocation, for instance on an embedded vector.  This returns
-   nonzero in exactly the same circumstances that VEC_T_reserve
+/* If this vector has space for RESERVE additional entries, return
+   true.  You usually only need to use this if you are doing your
+   own vector reallocation, for instance on an embedded vector.  This
+   returns true in exactly the same circumstances that vec_reserve
    will.  */
 
-#define VEC_space(T,V,R)	(VEC_space_1<T> (V, R VEC_CHECK_INFO))
-
 template<typename T>
-static inline int
-VEC_space_1 (vec_t<T> *vec_, int alloc_ VEC_CHECK_DECL)
+bool
+vec_t<T>::space (int nelems VEC_CHECK_DECL)
 {
-  VEC_ASSERT (alloc_ >= 0, "space", T, base);
-  return vec_
-	 ? vec_->prefix.alloc - vec_->prefix.num >= (unsigned)alloc_
-	 : !alloc_;
+  VEC_ASSERT (nelems >= 0, "space", T, base);
+  return prefix_.alloc_ - prefix_.num_ >= static_cast <unsigned> (nelems);
 }
 
 
-/* Reserve space.
-   int VEC_T_A_reserve(VEC(T,A) *&v, int reserve);
-
-   Ensure that V has at least RESERVE slots available.  This will
-   create additional headroom.  Note this can cause V to be
-   reallocated.  Returns nonzero iff reallocation actually
-   occurred.  */
+/* Ensure that the vector **VEC has at least RESERVE slots available.  This
+   will create additional headroom.  Note this can cause **VEC to
+   be reallocated.  Returns true iff reallocation actually occurred.  */
 
-#define VEC_reserve(T,A,V,R)	\
-  	(VEC_reserve_1<T, A> (&(V), (int)(R) VEC_CHECK_INFO MEM_STAT_INFO))
-
-template<typename T, enum vec_allocation_t A>
-static inline int
-VEC_reserve_1 (vec_t<T> **vec_, int alloc_  VEC_CHECK_DECL MEM_STAT_DECL)
+template<typename T>
+template<enum vec_allocation_t A>
+bool
+vec_t<T>::reserve (vec_t<T> **vec, int nelems VEC_CHECK_DECL MEM_STAT_DECL)
 {
-  int extend = !VEC_space_1 (*vec_, alloc_ VEC_CHECK_PASS);
+  bool extend = (*vec) ? !(*vec)->space (nelems VEC_CHECK_PASS) : nelems != 0;
 
   if (extend)
-    *vec_ = vec_reserve<T, A> (*vec_, alloc_ PASS_MEM_STAT);
+    *vec = vec_t<T>::reserve<A> (*vec, nelems PASS_MEM_STAT);
 
   return extend;
 }
 
 
-/* Reserve space exactly.
-   int VEC_T_A_reserve_exact(VEC(T,A) *&v, int reserve);
-
-   Ensure that V has at least RESERVE slots available.  This will not
-   create additional headroom.  Note this can cause V to be
-   reallocated.  Returns nonzero iff reallocation actually
-   occurred.  */
+/* Ensure that **VEC has at least NELEMS slots available.  This will not
+   create additional headroom.  Note this can cause VEC to be
+   reallocated.  Returns true iff reallocation actually occurred.  */
 
-#define VEC_reserve_exact(T,A,V,R)	\
-	(VEC_reserve_exact_1<T, A> (&(V), R VEC_CHECK_INFO MEM_STAT_INFO))
-
-template<typename T, enum vec_allocation_t A>
-static inline int
-VEC_reserve_exact_1 (vec_t<T> **vec_, int alloc_ VEC_CHECK_DECL MEM_STAT_DECL)
+template<typename T>
+template<enum vec_allocation_t A>
+bool
+vec_t<T>::reserve_exact (vec_t<T> **vec, int nelems VEC_CHECK_DECL
+			 MEM_STAT_DECL)
 {
-  int extend = !VEC_space_1 (*vec_, alloc_ VEC_CHECK_PASS);
+  bool extend = (*vec) ? !(*vec)->space (nelems VEC_CHECK_PASS) : nelems != 0;
 
   if (extend)
-    *vec_ = vec_reserve_exact<T, A> (*vec_, alloc_ PASS_MEM_STAT);
+    *vec = vec_t<T>::reserve_exact<A> (*vec, nelems PASS_MEM_STAT);
 
   return extend;
 }
 
 
-/* Copy elements with no reallocation
-   void VEC_T_splice (VEC(T) *dst, VEC(T) *src); // Integer
-   void VEC_T_splice (VEC(T) *dst, VEC(T) *src); // Pointer
-   void VEC_T_splice (VEC(T) *dst, VEC(T) *src); // Object
-
-   Copy the elements in SRC to the end of DST as if by memcpy.  DST and
-   SRC need not be allocated with the same mechanism, although they most
-   often will be.  DST is assumed to have sufficient headroom
-   available.  */
-
-#define VEC_splice(T,DST,SRC)	(VEC_splice_1<T> (DST, SRC VEC_CHECK_INFO))
+/* Copy the elements from SRC to the end of this vector as if by memcpy.
+   SRC and this vector need not be allocated with the same mechanism,
+   although they most often will be.  This vector is assumed to have
+   sufficient headroom available.  */
 
 template<typename T>
-static inline void
-VEC_splice_1 (vec_t<T> *dst_, vec_t<T> *src_ VEC_CHECK_DECL)
+void
+vec_t<T>::splice (vec_t<T> *src VEC_CHECK_DECL)
 {
-  if (src_)
+  if (src)
     {
-      unsigned len_ = src_->prefix.num;
-      VEC_ASSERT (dst_->prefix.num + len_ <= dst_->prefix.alloc, "splice",
-		  T, base);
-
-      memcpy (&dst_->vec[dst_->prefix.num], &src_->vec[0], len_ * sizeof (T));
-      dst_->prefix.num += len_;
+      unsigned len = VEC_length (T, src);
+      VEC_ASSERT (VEC_length (T, this) + len <= prefix_.alloc_, "splice", T,
+		  base);
+      memcpy (address () + VEC_length (T, this),
+	      src->address (),
+	      len * sizeof (T));
+      prefix_.num_ += len;
     }
 }
 
 
-/* Copy elements with reallocation
-   void VEC_T_safe_splice (VEC(T,A) *&dst, VEC(T) *src); // Integer
-   void VEC_T_safe_splice (VEC(T,A) *&dst, VEC(T) *src); // Pointer
-   void VEC_T_safe_splice (VEC(T,A) *&dst, VEC(T) *src); // Object
-
-   Copy the elements in SRC to the end of DST as if by memcpy.  DST and
+/* Copy the elements in SRC to the end of DST as if by memcpy.  DST and
    SRC need not be allocated with the same mechanism, although they most
    often will be.  DST need not have sufficient headroom and will be
    reallocated if needed.  */
 
-#define VEC_safe_splice(T,A,DST,SRC)					\
-	(VEC_safe_splice_1<T, A> (&(DST), SRC VEC_CHECK_INFO MEM_STAT_INFO))
-
-template<typename T, enum vec_allocation_t A>
-static inline void
-VEC_safe_splice_1 (vec_t<T> **dst_, vec_t<T> *src_ VEC_CHECK_DECL MEM_STAT_DECL)
+template<typename T>
+template<enum vec_allocation_t A>
+void
+vec_t<T>::safe_splice (vec_t<T> **dst, vec_t<T> *src VEC_CHECK_DECL
+		       MEM_STAT_DECL)
 {
-  if (src_)
+  if (src)
     {
-      VEC_reserve_exact_1<T, A> (dst_, src_->prefix.num
-				 VEC_CHECK_PASS MEM_STAT_INFO);
-
-      VEC_splice_1 (*dst_, src_ VEC_CHECK_PASS);
+      vec_t<T>::reserve_exact<A> (dst, VEC_length (T, src) VEC_CHECK_PASS
+			          MEM_STAT_INFO);
+      (*dst)->splice (src VEC_CHECK_PASS);
     }
 }
 
   
-/* Push object with no reallocation
-   T *VEC_T_quick_push (VEC(T) *v, T obj); // Integer
-   T *VEC_T_quick_push (VEC(T) *v, T obj); // Pointer
-   T *VEC_T_quick_push (VEC(T) *v, T *obj); // Object
-
-   Push a new element onto the end, returns a pointer to the slot
-   filled in. For object vectors, the new value can be NULL, in which
-   case NO initialization is performed.  There must
-   be sufficient space in the vector.  */
-
-#define VEC_quick_push(T,V,O)	(VEC_quick_push_1<T> (V, O VEC_CHECK_INFO))
+/* Push OBJ (a new element) onto the end, returns a reference to the slot
+   filled in.  There must be sufficient space in the vector.  */
 
 template<typename T>
-static inline T &
-VEC_quick_push_1 (vec_t<T> *vec_, T obj_ VEC_CHECK_DECL)
+T &
+vec_t<T>::quick_push (T obj VEC_CHECK_DECL)
 {
-  VEC_ASSERT (vec_->prefix.num < vec_->prefix.alloc, "push", T, base);
-  vec_->vec[vec_->prefix.num] = obj_;
-  T &val_ = vec_->vec[vec_->prefix.num];
-  vec_->prefix.num++;
-  return val_;
+  VEC_ASSERT (prefix_.num_ < prefix_.alloc_, "push", T, base);
+  vec_[prefix_.num_] = obj;
+  T &val = vec_[prefix_.num_];
+  prefix_.num_++;
+  return val;
 }
 
+
+/* Push PTR (a new pointer to an element) onto the end, returns a
+   pointer to the slot filled in. The new value can be NULL, in which
+   case NO initialization is performed.  There must be sufficient
+   space in the vector.  */
+
 template<typename T>
-static inline T *
-VEC_quick_push_1 (vec_t<T> *vec_, const T *ptr_ VEC_CHECK_DECL)
+T *
+vec_t<T>::quick_push (const T *ptr VEC_CHECK_DECL)
 {
-  T *slot_;
-  VEC_ASSERT (vec_->prefix.num < vec_->prefix.alloc, "push", T, base);
-  slot_ = &vec_->vec[vec_->prefix.num++];
-  if (ptr_)
-    *slot_ = *ptr_;
-  return slot_;
+  VEC_ASSERT (prefix_.num_ < prefix_.alloc_, "push", T, base);
+  T *slot = &vec_[prefix_.num_++];
+  if (ptr)
+    *slot = *ptr;
+  return slot;
 }
 
 
-/* Push object with reallocation
-   T *VEC_T_A_safe_push (VEC(T,A) *&v, T obj); // Integer
-   T *VEC_T_A_safe_push (VEC(T,A) *&v, T obj); // Pointer
-   T *VEC_T_A_safe_push (VEC(T,A) *&v, T *obj); // Object
-
-   Push a new element onto the end, returns a pointer to the slot
-   filled in. For object vectors, the new value can be NULL, in which
-   case NO initialization is performed.  Reallocates V, if needed.  */
+/* Push a new element OBJ onto the end of VEC.  Returns a reference to
+   the slot filled in.  Reallocates V, if needed.  */
 
-#define VEC_safe_push(T,A,V,O)		\
-	(VEC_safe_push_1<T, A> (&(V), O VEC_CHECK_INFO MEM_STAT_INFO))
-
-template<typename T, enum vec_allocation_t A>
-static inline T &
-VEC_safe_push_1 (vec_t<T> **vec_, T obj_ VEC_CHECK_DECL MEM_STAT_DECL)
+template<typename T>
+template<enum vec_allocation_t A>
+T &
+vec_t<T>::safe_push (vec_t<T> **vec, T obj VEC_CHECK_DECL MEM_STAT_DECL)
 {
-  VEC_reserve_1<T, A> (vec_, 1 VEC_CHECK_PASS PASS_MEM_STAT);
-  return VEC_quick_push_1 (*vec_, obj_ VEC_CHECK_PASS);
+  vec_t<T>::reserve<A> (vec, 1 VEC_CHECK_PASS PASS_MEM_STAT);
+  return (*vec)->quick_push (obj VEC_CHECK_PASS);
 }
 
-template<typename T, enum vec_allocation_t A>
-static inline T *
-VEC_safe_push_1 (vec_t<T> **vec_, const T *ptr_ VEC_CHECK_DECL MEM_STAT_DECL)
+
+/* Push a pointer PTR to a new element onto the end of VEC.  Returns a
+   pointer to the slot filled in. For object vectors, the new value
+   can be NULL, in which case NO initialization is performed.
+   Reallocates VEC, if needed.  */
+
+template<typename T>
+template<enum vec_allocation_t A>
+T *
+vec_t<T>::safe_push (vec_t<T> **vec, const T *ptr VEC_CHECK_DECL MEM_STAT_DECL)
 {
-  VEC_reserve_1<T, A> (vec_, 1 VEC_CHECK_PASS PASS_MEM_STAT);
-  return VEC_quick_push_1 (*vec_, ptr_ VEC_CHECK_PASS);
+  vec_t<T>::reserve<A> (vec, 1 VEC_CHECK_PASS PASS_MEM_STAT);
+  return (*vec)->quick_push (ptr VEC_CHECK_PASS);
 }
 
 
-/* Pop element off end
-   T VEC_T_pop (VEC(T) *v);		// Integer
-   T VEC_T_pop (VEC(T) *v);		// Pointer
-   void VEC_T_pop (VEC(T) *v);		// Object
+/* Pop and return the last element off the end of the vector.  */
 
-   Pop the last element off the end. Returns the element popped, for
-   pointer vectors.  */
-
-#define VEC_pop(T,V)	(VEC_pop_1<T> (V VEC_CHECK_INFO))
 
 template<typename T>
-static inline T&
-VEC_pop_1 (vec_t<T> *vec_ VEC_CHECK_DECL)
+T &
+vec_t<T>::pop (ALONE_VEC_CHECK_DECL)
 {
-  VEC_ASSERT (vec_->prefix.num, "pop", T, base);
-  return vec_->vec[--vec_->prefix.num];
+  VEC_ASSERT (prefix_.num_, "pop", T, base);
+  return vec_[--prefix_.num_];
 }
 
 
-/* Truncate to specific length
-   void VEC_T_truncate (VEC(T) *v, unsigned len);
-
-   Set the length as specified.  The new length must be less than or
-   equal to the current length.  This is an O(1) operation.  */
-
-#define VEC_truncate(T,V,I)	\
-	(VEC_truncate_1<T> (V, (unsigned)(I) VEC_CHECK_INFO))
+/* Set the length of the vector to LEN.  The new length must be less
+   than or equal to the current length.  This is an O(1) operation.  */
 
 template<typename T>
-static inline void
-VEC_truncate_1 (vec_t<T> *vec_, unsigned size_ VEC_CHECK_DECL)
+void
+vec_t<T>::truncate (unsigned size VEC_CHECK_DECL)
 {
-  VEC_ASSERT (vec_ ? vec_->prefix.num >= size_ : !size_, "truncate", T, base);
-  if (vec_)
-    vec_->prefix.num = size_;
+  VEC_ASSERT (prefix_.num_ >= size, "truncate", T, base);
+  prefix_.num_ = size;
 }
 
 
-/* Grow to a specific length.
-   void VEC_T_A_safe_grow (VEC(T,A) *&v, int len);
-
-   Grow the vector to a specific length.  The LEN must be as
+/* Grow the vector VEC to a specific length.  The LEN must be as
    long or longer than the current length.  The new elements are
    uninitialized.  */
 
-#define VEC_safe_grow(T,A,V,I)		\
-	(VEC_safe_grow_1<T, A> (&(V), (int)(I) VEC_CHECK_INFO MEM_STAT_INFO))
-
-template<typename T, enum vec_allocation_t A>
-static inline void
-VEC_safe_grow_1 (vec_t<T> **vec_, int size_ VEC_CHECK_DECL MEM_STAT_DECL)
+template<typename T>
+template<enum vec_allocation_t A>
+void
+vec_t<T>::safe_grow (vec_t<T> **vec, int size VEC_CHECK_DECL MEM_STAT_DECL)
 {
-  VEC_ASSERT (size_ >= 0 && VEC_length (T, *vec_) <= (unsigned)size_,
+  VEC_ASSERT (size >= 0 && VEC_length (T, *vec) <= (unsigned)size,
 	      "grow", T, A);
-  VEC_reserve_exact_1<T, A> (vec_,
-			     size_ - (int)(*vec_ ? (*vec_)->prefix.num : 0)
-			     VEC_CHECK_PASS PASS_MEM_STAT);
-  (*vec_)->prefix.num = size_;
+  vec_t<T>::reserve_exact<A> (vec, size - (int)VEC_length (T, *vec)
+		              VEC_CHECK_PASS PASS_MEM_STAT);
+  (*vec)->prefix_.num_ = size;
 }
 
 
-/* Grow to a specific length.
-   void VEC_T_A_safe_grow_cleared (VEC(T,A) *&v, int len);
-
-   Grow the vector to a specific length.  The LEN must be as
+/* Grow the vector *VEC to a specific length.  The LEN must be as
    long or longer than the current length.  The new elements are
    initialized to zero.  */
 
-#define VEC_safe_grow_cleared(T,A,V,I)			\
-	(VEC_safe_grow_cleared_1<T,A> (&(V), (int)(I)	\
-				       VEC_CHECK_INFO MEM_STAT_INFO))
-
-template<typename T, enum vec_allocation_t A>
-static inline void
-VEC_safe_grow_cleared_1 (vec_t<T> **vec_, int size_ VEC_CHECK_DECL
-			 MEM_STAT_DECL)
+template<typename T>
+template<enum vec_allocation_t A>
+void
+vec_t<T>::safe_grow_cleared (vec_t<T> **vec, int size VEC_CHECK_DECL
+			     MEM_STAT_DECL)
 {
-  int oldsize = VEC_length (T, *vec_);
-  VEC_safe_grow_1<T, A> (vec_, size_ VEC_CHECK_PASS PASS_MEM_STAT);
-  memset (&(VEC_address (T, *vec_)[oldsize]), 0,
-	  sizeof (T) * (size_ - oldsize));
+  int oldsize = VEC_length (T, *vec);
+  vec_t<T>::safe_grow<A> (vec, size VEC_CHECK_PASS PASS_MEM_STAT);
+  memset (&((*vec)->address ()[oldsize]), 0, sizeof (T) * (size - oldsize));
 }
 
 
-/* Replace element
-   T VEC_T_replace (VEC(T) *v, unsigned ix, T val); // Integer
-   T VEC_T_replace (VEC(T) *v, unsigned ix, T val); // Pointer
-   T *VEC_T_replace (VEC(T) *v, unsigned ix, T *val);  // Object
-
-   Replace the IXth element of V with a new value, VAL.  For pointer
-   vectors returns the original value. For object vectors returns a
-   pointer to the new value.  For object vectors the new value can be
-   NULL, in which case no overwriting of the slot is actually
-   performed.  */
-
-#define VEC_replace(T,V,I,O)		\
-	(VEC_replace_1<T> (V, (unsigned)(I), O VEC_CHECK_INFO))
+/* Replace the IXth element of this vector with a new value, VAL.  */
 
 template<typename T>
-static inline T&
-VEC_replace_1 (vec_t<T> *vec_, unsigned ix_, T obj_ VEC_CHECK_DECL)
+void
+vec_t<T>::replace (unsigned ix, T obj VEC_CHECK_DECL)
 {
-  VEC_ASSERT (ix_ < vec_->prefix.num, "replace", T, base);
-  vec_->vec[ix_] = obj_;
-  return vec_->vec[ix_];
+  VEC_ASSERT (ix < prefix_.num_, "replace", T, base);
+  vec_[ix] = obj;
 }
 
 
-/* Insert object with no reallocation
-   void VEC_T_quick_insert (VEC(T) *v, unsigned ix, T val); // Integer
-   void VEC_T_quick_insert (VEC(T) *v, unsigned ix, T val); // Pointer
-   void VEC_T_quick_insert (VEC(T) *v, unsigned ix, T *val); // Object
+/* Insert an element, OBJ, at the IXth position of VEC.  There must be
+   sufficient space.  */
 
-   Insert an element, VAL, at the IXth position of V.  For vectors of
-   object, the new value can be NULL, in which case no initialization
-   of the inserted slot takes place. There must be sufficient space.  */
+template<typename T>
+void
+vec_t<T>::quick_insert (unsigned ix, T obj VEC_CHECK_DECL)
+{
+  VEC_ASSERT (prefix_.num_ < prefix_.alloc_, "insert", T, base);
+  VEC_ASSERT (ix <= prefix_.num_, "insert", T, base);
+  T *slot = &vec_[ix];
+  memmove (slot + 1, slot, (prefix_.num_++ - ix) * sizeof (T));
+  *slot = obj;
+}
 
-#define VEC_quick_insert(T,V,I,O)	\
-	(VEC_quick_insert_1<T> (V,I,O VEC_CHECK_INFO))
+
+/* Insert an element, *PTR, at the IXth position of V.  The new value
+   can be NULL, in which case no initialization of the inserted slot
+   takes place. There must be sufficient space.  */
 
 template<typename T>
-static inline void
-VEC_quick_insert_1 (vec_t<T> *vec_, unsigned ix_, T obj_ VEC_CHECK_DECL)
+void
+vec_t<T>::quick_insert (unsigned ix, const T *ptr VEC_CHECK_DECL)
 {
-  T *slot_;
-
-  VEC_ASSERT (vec_->prefix.num < vec_->prefix.alloc, "insert", T, base);
-  VEC_ASSERT (ix_ <= vec_->prefix.num, "insert", T, base);
-  slot_ = &vec_->vec[ix_];
-  memmove (slot_ + 1, slot_, (vec_->prefix.num++ - ix_) * sizeof (T));
-  *slot_ = obj_;
+  VEC_ASSERT (prefix_.num_ < prefix_.alloc_, "insert", T, base);
+  VEC_ASSERT (ix <= prefix_.num_, "insert", T, base);
+  T *slot = &vec_[ix];
+  memmove (slot + 1, slot, (prefix_.num_++ - ix) * sizeof (T));
+  if (ptr)
+    *slot = *ptr;
 }
 
+
+/* Insert an element, VAL, at the IXth position of VEC. Reallocate
+   VEC, if necessary.  */
+
 template<typename T>
-static inline void
-VEC_quick_insert_1 (vec_t<T> *vec_, unsigned ix_, const T *ptr_ VEC_CHECK_DECL)
+template<enum vec_allocation_t A>
+void
+vec_t<T>::safe_insert (vec_t<T> **vec, unsigned ix, T obj VEC_CHECK_DECL
+		       MEM_STAT_DECL)
 {
-  T *slot_;
-
-  VEC_ASSERT (vec_->prefix.num < vec_->prefix.alloc, "insert", T, base);
-  VEC_ASSERT (ix_ <= vec_->prefix.num, "insert", T, base);
-  slot_ = &vec_->vec[ix_];
-  memmove (slot_ + 1, slot_, (vec_->prefix.num++ - ix_) * sizeof (T));
-  if (ptr_)
-    *slot_ = *ptr_;
+  vec_t<T>::reserve<A> (vec, 1 VEC_CHECK_PASS PASS_MEM_STAT);
+  (*vec)->quick_insert (ix, obj VEC_CHECK_PASS);
 }
 
 
-/* Insert object with reallocation
-   T *VEC_T_A_safe_insert (VEC(T,A) *&v, unsigned ix, T val); // Integer
-   T *VEC_T_A_safe_insert (VEC(T,A) *&v, unsigned ix, T val); // Pointer
-   T *VEC_T_A_safe_insert (VEC(T,A) *&v, unsigned ix, T *val); // Object
-
-   Insert an element, VAL, at the IXth position of V. Return a pointer
+/* Insert an element, *PTR, at the IXth position of VEC. Return a pointer
    to the slot created.  For vectors of object, the new value can be
    NULL, in which case no initialization of the inserted slot takes
    place. Reallocate V, if necessary.  */
 
-#define VEC_safe_insert(T,A,V,I,O)	\
-	(VEC_safe_insert_1<T, A> (&(V),I,O VEC_CHECK_INFO MEM_STAT_INFO))
-
-template<typename T, enum vec_allocation_t A>
-static inline void
-VEC_safe_insert_1 (vec_t<T> **vec_, unsigned ix_, T obj_
-		   VEC_CHECK_DECL MEM_STAT_DECL)
-{
-  VEC_reserve_1<T, A> (vec_, 1 VEC_CHECK_PASS PASS_MEM_STAT);
-  VEC_quick_insert_1 (*vec_, ix_, obj_ VEC_CHECK_PASS);
-}
-
-template<typename T, enum vec_allocation_t A>
-static inline void
-VEC_safe_insert_1 (vec_t<T> **vec_, unsigned ix_, T *ptr_
-		   VEC_CHECK_DECL MEM_STAT_DECL)
+template<typename T>
+template<enum vec_allocation_t A>
+void
+vec_t<T>::safe_insert (vec_t<T> **vec, unsigned ix, T *ptr VEC_CHECK_DECL
+		       MEM_STAT_DECL)
 {
-  VEC_reserve_1<T, A> (vec_, 1 VEC_CHECK_PASS PASS_MEM_STAT);
-  VEC_quick_insert_1 (*vec_, ix_, ptr_ VEC_CHECK_PASS);
+  vec_t<T>::reserve<A> (vec, 1 VEC_CHECK_PASS PASS_MEM_STAT);
+  (*vec)->quick_insert (ix, ptr VEC_CHECK_PASS);
 }
 
 
-
-/* Remove element retaining order
-   void VEC_T_ordered_remove (VEC(T) *v, unsigned ix); // Integer
-   void VEC_T_ordered_remove (VEC(T) *v, unsigned ix); // Pointer
-   void VEC_T_ordered_remove (VEC(T) *v, unsigned ix); // Object
-
-   Remove an element from the IXth position of V. Ordering of
+/* Remove an element from the IXth position of this vector.  Ordering of
    remaining elements is preserved.  This is an O(N) operation due to
    a memmove.  */
 
-#define VEC_ordered_remove(T,V,I)	\
-	(VEC_ordered_remove_1<T> (V,I VEC_CHECK_INFO))
-
 template<typename T>
-static inline void
-VEC_ordered_remove_1 (vec_t<T> *vec_, unsigned ix_ VEC_CHECK_DECL)
+void
+vec_t<T>::ordered_remove (unsigned ix VEC_CHECK_DECL)
 {
-  T *slot_;
-  VEC_ASSERT (ix_ < vec_->prefix.num, "remove", T, base);
-  slot_ = &vec_->vec[ix_];
-  memmove (slot_, slot_ + 1, (--vec_->prefix.num - ix_) * sizeof (T));
+  VEC_ASSERT (ix < prefix_.num_, "remove", T, base);
+  T *slot = &vec_[ix];
+  memmove (slot, slot + 1, (--prefix_.num_ - ix) * sizeof (T));
 }
 
 
-/* Remove element destroying order
-   void VEC_T_unordered_remove (VEC(T) *v, unsigned ix); // Integer
-   void VEC_T_unordered_remove (VEC(T) *v, unsigned ix); // Pointer
-   void VEC_T_unordered_remove (VEC(T) *v, unsigned ix); // Object
-
-   Remove an element from the IXth position of V.  Ordering of
+/* Remove an element from the IXth position of VEC.  Ordering of
    remaining elements is destroyed.  This is an O(1) operation.  */
 
-#define VEC_unordered_remove(T,V,I)	\
-	(VEC_unordered_remove_1<T> (V,I VEC_CHECK_INFO))
-
 template<typename T>
-static inline void
-VEC_unordered_remove_1 (vec_t<T> *vec_, unsigned ix_ VEC_CHECK_DECL)
+void
+vec_t<T>::unordered_remove (unsigned ix VEC_CHECK_DECL)
 {
-  VEC_ASSERT (ix_ < vec_->prefix.num, "remove", T, base);
-  vec_->vec[ix_] = vec_->vec[--vec_->prefix.num];
+  VEC_ASSERT (ix < prefix_.num_, "remove", T, base);
+  vec_[ix] = vec_[--prefix_.num_];
 }
 
 
-/* Remove a block of elements
-   void VEC_T_block_remove (VEC(T) *v, unsigned ix, unsigned len);
-
-   Remove LEN elements starting at the IXth.  Ordering is retained.
+/* Remove LEN elements starting at the IXth.  Ordering is retained.
    This is an O(N) operation due to memmove.  */
 
-#define VEC_block_remove(T,V,I,L)	\
-	(VEC_block_remove_1<T> (V, I, L VEC_CHECK_INFO))
-
 template<typename T>
-static inline void
-VEC_block_remove_1 (vec_t<T> *vec_, unsigned ix_, unsigned len_ VEC_CHECK_DECL)
+void
+vec_t<T>::block_remove (unsigned ix, unsigned len VEC_CHECK_DECL)
 {
-  T *slot_;
-  VEC_ASSERT (ix_ + len_ <= vec_->prefix.num, "block_remove", T, base);
-  slot_ = &vec_->vec[ix_];
-  vec_->prefix.num -= len_;
-  memmove (slot_, slot_ + len_, (vec_->prefix.num - ix_) * sizeof (T));
+  VEC_ASSERT (ix + len <= prefix_.num_, "block_remove", T, base);
+  T *slot = &vec_[ix];
+  prefix_.num_ -= len;
+  memmove (slot, slot + len, (prefix_.num_ - ix) * sizeof (T));
 }
 
+/* Sort the contents of V with qsort.  Use CMP as the comparison function.  */
+#define VEC_qsort(T,V,CMP)						\
+	qsort (VEC_address (T, V), VEC_length (T, V), sizeof (T), CMP)
 
-/* Conveniently sort the contents of the vector with qsort.
-   void VEC_qsort (VEC(T) *v, int (*cmp_func)(const void *, const void *))  */
-
-#define VEC_qsort(T,V,CMP) qsort(VEC_address (T, V), VEC_length (T, V),	\
-				 sizeof (T), CMP)
-
-
-/* Find the first index in the vector not less than the object.
-   unsigned VEC_T_lower_bound (VEC(T) *v, const T val,
-                               bool (*lessthan) (const T, const T)); // Integer
-   unsigned VEC_T_lower_bound (VEC(T) *v, const T val,
-                               bool (*lessthan) (const T, const T)); // Pointer
-   unsigned VEC_T_lower_bound (VEC(T) *v, const T *val,
-                               bool (*lessthan) (const T*, const T*)); // Object
 
-   Find the first position in which VAL could be inserted without
-   changing the ordering of V.  LESSTHAN is a function that returns
-   true if the first argument is strictly less than the second.  */
-
-#define VEC_lower_bound(T,V,O,LT)	\
-        (VEC_lower_bound_1<T> (V, O, LT VEC_CHECK_INFO))
+/* Find and return the first position in which OBJ could be inserted
+   without changing the ordering of this vector.  LESSTHAN is a
+   function that returns true if the first argument is strictly less
+   than the second.  */
 
 template<typename T>
-static inline unsigned
-VEC_lower_bound_1 (vec_t<T> *vec_, T obj_,
-		   bool (*lessthan_)(T, T) VEC_CHECK_DECL)
+unsigned
+vec_t<T>::lower_bound (T obj, bool (*lessthan)(T, T)) const
 {
-  unsigned int len_ = VEC_length (T, vec_);
-  unsigned int half_, middle_;
-  unsigned int first_ = 0;
-  while (len_ > 0)
+  unsigned int len = VEC_length (T, this);
+  unsigned int half, middle;
+  unsigned int first = 0;
+  while (len > 0)
     {
-      T middle_elem_;
-      half_ = len_ >> 1;
-      middle_ = first_;
-      middle_ += half_;
-      middle_elem_ = VEC_index_1 (vec_, middle_ VEC_CHECK_PASS);
-      if (lessthan_ (middle_elem_, obj_))
+      half = len >> 1;
+      middle = first;
+      middle += half;
+      T middle_elem = (*this)[middle];
+      if (lessthan (middle_elem, obj))
 	{
-	  first_ = middle_;
-	  ++first_;
-	  len_ = len_ - half_ - 1;
+	  first = middle;
+	  ++first;
+	  len = len - half - 1;
 	}
       else
-	len_ = half_;
+	len = half;
     }
-  return first_;
+  return first;
 }
 
+
+/* Find and return the first position in which *PTR could be inserted
+   without changing the ordering of this vector.  LESSTHAN is a
+   function that returns true if the first argument is strictly less
+   than the second.  */
+
 template<typename T>
-static inline unsigned
-VEC_lower_bound_1 (vec_t<T> *vec_, const T *ptr_,
-		   bool (*lessthan_)(const T*, const T*) VEC_CHECK_DECL)
+unsigned
+vec_t<T>::lower_bound (const T *ptr,
+		       bool (*lessthan_)(const T *, const T *)) const
 {
-  unsigned int len_ = VEC_length (T, vec_);
-  unsigned int half_, middle_;
-  unsigned int first_ = 0;
-  while (len_ > 0)
+  unsigned int len = VEC_length (T, this);
+  unsigned int half, middle;
+  unsigned int first = 0;
+  while (len > 0)
     {
-      T *middle_elem_;
-      half_ = len_ >> 1;
-      middle_ = first_;
-      middle_ += half_;
-      middle_elem_ = &VEC_index_1 (vec_, middle_ VEC_CHECK_PASS);
-      if (lessthan_ (middle_elem_, ptr_))
+      half = len >> 1;
+      middle = first;
+      middle += half;
+      const T *middle_elem = &(*this)[middle];
+      if (lessthan (middle_elem, ptr))
 	{
-	  first_ = middle_;
-	  ++first_;
-	  len_ = len_ - half_ - 1;
+	  first = middle;
+	  ++first;
+	  len = len - half - 1;
 	}
       else
-	len_ = half_;
+	len = half;
     }
-  return first_;
+  return first;
 }
 
 
@@ -1084,62 +1107,62 @@  void *vec_gc_o_reserve_1 (void *, int, size_t, size_t, bool MEM_STAT_DECL);
    exponentially.  As a special case, if VEC_ is NULL, and RESERVE is
    0, no vector will be created. */
 
-template<typename T, enum vec_allocation_t A>
+template<typename T>
+template<enum vec_allocation_t A>
 vec_t<T> *
-vec_reserve (vec_t<T> *vec_, int reserve MEM_STAT_DECL)
+vec_t<T>::reserve (vec_t<T> *vec, int reserve MEM_STAT_DECL)
 {
-  if (A == gc)
-    return (vec_t<T> *) vec_gc_o_reserve_1 (vec_, reserve,
-					    offsetof (vec_t<T>, vec),
-					    sizeof (T), false
-					    PASS_MEM_STAT);
-  else if (A == heap)
-    return (vec_t<T> *) vec_heap_o_reserve_1 (vec_, reserve,
-					      offsetof (vec_t<T>, vec),
-					      sizeof (T), false
-					      PASS_MEM_STAT);
-  else
-    return (vec_t<T> *) vec_stack_o_reserve (vec_, reserve,
-					     offsetof (vec_t<T>, vec),
-					     sizeof (T) PASS_MEM_STAT);
+  void *res = NULL;
+  size_t off = offsetof (vec_t<T>, vec_);
+  size_t sz = sizeof (T);
+
+  switch (A)
+    {
+      case gc:
+	res = vec_gc_o_reserve_1 (vec, reserve, off, sz, false PASS_MEM_STAT);
+	break;
+      case heap:
+	res = vec_heap_o_reserve_1 (vec, reserve, off, sz, false PASS_MEM_STAT);
+	break;
+      case stack:
+	res = vec_stack_o_reserve (vec, reserve, off, sz PASS_MEM_STAT);
+	break;
+    }
+
+  return static_cast <vec_t<T> *> (res);
 }
 
 
-/* Ensure there are at least RESERVE free slots in VEC_, growing
+/* Ensure there are at least RESERVE free slots in VEC, growing
    exactly.  If RESERVE < 0 grow exactly, else grow exponentially.  As
-   a special case, if VEC_ is NULL, and RESERVE is 0, no vector will be
+   a special case, if VEC is NULL, and RESERVE is 0, no vector will be
    created. */
 
-template<typename T, enum vec_allocation_t A>
+template<typename T>
+template<enum vec_allocation_t A>
 vec_t<T> *
-vec_reserve_exact (vec_t<T> *vec_, int reserve MEM_STAT_DECL)
+vec_t<T>::reserve_exact (vec_t<T> *vec, int reserve MEM_STAT_DECL)
 {
-  if (A == gc)
-    return (vec_t<T> *) vec_gc_o_reserve_1 (vec_, reserve,
-					    sizeof (struct vec_prefix),
-					    sizeof (T), true
-					    PASS_MEM_STAT);
-  else if (A == heap)
-    return (vec_t<T> *) vec_heap_o_reserve_1 (vec_, reserve,
-					      sizeof (struct vec_prefix),
-					      sizeof (T), true
-					      PASS_MEM_STAT);
-  else if (A == stack)
+  void *res = NULL;
+  size_t off = sizeof (struct vec_prefix);
+  size_t sz = sizeof (T);
+
+  gcc_assert (offsetof (vec_t<T>, vec_) == sizeof (struct vec_prefix));
+
+  switch (A)
     {
-      /* Only allow stack vectors when re-growing them.  The initial
-	 allocation of stack vectors must be done with VEC_alloc,
-	 because it uses alloca() for the allocation.  */
-      if (vec_ == NULL)
-	{
-	  fprintf (stderr, "Stack vectors must be initially allocated "
-		   "with VEC_stack_alloc.\n");
-	  gcc_unreachable ();
-	}
-      return (vec_t<T> *) vec_stack_o_reserve_exact (vec_, reserve,
-						     sizeof (struct vec_prefix),
-						     sizeof (T)
-						     PASS_MEM_STAT);
+      case gc:
+	res = vec_gc_o_reserve_1 (vec, reserve, off, sz, true PASS_MEM_STAT);
+	break;
+      case heap:
+	res = vec_heap_o_reserve_1 (vec, reserve, off, sz, true PASS_MEM_STAT);
+	break;
+      case stack:
+	res = vec_stack_o_reserve_exact (vec, reserve, off, sz PASS_MEM_STAT);
+	break;
     }
+
+  return static_cast <vec_t<T> *> (res);
 }
 
 #endif /* GCC_VEC_H */
diff --git a/gcc/vec.c b/gcc/vec.c
index 51a55d9..be9f54a 100644
--- a/gcc/vec.c
+++ b/gcc/vec.c
@@ -175,8 +175,8 @@  calculate_allocation (const struct vec_prefix *pfx, int reserve, bool exact)
 
   if (pfx)
     {
-      alloc = pfx->alloc;
-      num = pfx->num;
+      alloc = pfx->alloc_;
+      num = pfx->num_;
     }
   else if (!reserve)
     /* If there's no prefix, and we've not requested anything, then we
@@ -240,9 +240,9 @@  vec_gc_o_reserve_1 (void *vec, int reserve, size_t vec_offset, size_t elt_size,
 
   vec = ggc_realloc_stat (vec, size PASS_MEM_STAT);
 
-  ((struct vec_prefix *)vec)->alloc = alloc;
+  ((struct vec_prefix *)vec)->alloc_ = alloc;
   if (!pfx)
-    ((struct vec_prefix *)vec)->num = 0;
+    ((struct vec_prefix *)vec)->num_ = 0;
 
   return vec;
 }
@@ -268,9 +268,9 @@  vec_heap_o_reserve_1 (void *vec, int reserve, size_t vec_offset,
     free_overhead (pfx);
 
   vec = xrealloc (vec, vec_offset + alloc * elt_size);
-  ((struct vec_prefix *)vec)->alloc = alloc;
+  ((struct vec_prefix *)vec)->alloc_ = alloc;
   if (!pfx)
-    ((struct vec_prefix *)vec)->num = 0;
+    ((struct vec_prefix *)vec)->num_ = 0;
   if (GATHER_STATISTICS && vec)
     register_overhead ((struct vec_prefix *)vec,
     		       vec_offset + alloc * elt_size FINAL_PASS_MEM_STAT);
@@ -306,8 +306,8 @@  vec_stack_p_reserve_exact_1 (int alloc, void *space)
 
   VEC_safe_push (void_p, heap, stack_vecs, space);
 
-  pfx->num = 0;
-  pfx->alloc = alloc;
+  pfx->num_ = 0;
+  pfx->alloc_ = alloc;
 
   return space;
 }
@@ -343,15 +343,15 @@  vec_stack_o_reserve_1 (void *vec, int reserve, size_t vec_offset,
     }
 
   /* Move VEC to the heap.  */
-  reserve += ((struct vec_prefix *) vec)->num;
+  reserve += ((struct vec_prefix *) vec)->num_;
   newvec = vec_heap_o_reserve_1 (NULL, reserve, vec_offset, elt_size,
 				 exact PASS_MEM_STAT);
   if (newvec && vec)
     {
-      ((struct vec_prefix *) newvec)->num = ((struct vec_prefix *) vec)->num;
+      ((struct vec_prefix *) newvec)->num_ = ((struct vec_prefix *) vec)->num_;
       memcpy (((struct vec_prefix *) newvec)+1,
 	      ((struct vec_prefix *) vec)+1,
-	      ((struct vec_prefix *) vec)->num * elt_size);
+	      ((struct vec_prefix *) vec)->num_ * elt_size);
     }
   return newvec;
 }