gdb: Remove vec.{c,h} and update code to not include vec.h
authorAndrew Burgess <andrew.burgess@embecosm.com>
Mon, 7 Oct 2019 15:38:53 +0000 (16:38 +0100)
committerAndrew Burgess <andrew.burgess@embecosm.com>
Tue, 15 Oct 2019 20:31:55 +0000 (21:31 +0100)
Removes vec.c and vec.h from the source tree, and remove all the
remaining includes of vec.h.  There should be no user visible changes
after this commit.

I did have a few issues rebuilding GDB after applying this patch due
to cached dependencies, I found that running this command in the build
directory resolved my build issues without requiring a 'make clean':

    rm -fr gdb/gdbserver/gdbsupport/.deps/

gdb/ChangeLog:

* Makefile.in: Remove references to vec.h and vec.c.
* aarch64-tdep.c: No longer include vec.h.
* ada-lang.c: Likewise.
* ada-lang.h: Likewise.
* arm-tdep.c: Likewise.
* ax.h: Likewise.
* breakpoint.h: Likewise.
* charset.c: Likewise.
* cp-support.h: Likewise.
* dtrace-probe.c: Likewise.
* dwarf2read.c: Likewise.
* extension.h: Likewise.
* gdb_bfd.c: Likewise.
* gdbsupport/gdb_vecs.h: Likewise.
* gdbsupport/vec.c: Remove.
* gdbsupport/vec.h: Remove.
* gdbthread.h: Likewise.
* guile/scm-type.c: Likewise.
* inline-frame.c: Likewise.
* machoread.c: Likewise.
* memattr.c: Likewise.
* memrange.h: Likewise.
* namespace.h: Likewise.
* nat/linux-btrace.h: Likewise.
* osdata.c: Likewise.
* parser-defs.h: Likewise.
* progspace.h: Likewise.
* python/py-type.c: Likewise.
* record-btrace.c: Likewise.
* rust-exp.y: Likewise.
* solib-target.c: Likewise.
* stap-probe.c: Likewise.
* target-descriptions.c: Likewise.
* target-memory.c: Likewise.
* target.h: Likewise.
* varobj.c: Likewise.
* varobj.h: Likewise.
* xml-support.h: Likewise.

gdb/gdbserver/ChangeLog:

* Makefile.in: Remove references to vec.c.

Change-Id: I0c91d7170bf1b5e992a387fcd9fe4f2abe343bb5

41 files changed:
gdb/ChangeLog
gdb/Makefile.in
gdb/aarch64-tdep.c
gdb/ada-lang.c
gdb/ada-lang.h
gdb/arm-tdep.c
gdb/ax.h
gdb/breakpoint.h
gdb/charset.c
gdb/cp-support.h
gdb/dtrace-probe.c
gdb/dwarf2read.c
gdb/extension.h
gdb/gdb_bfd.c
gdb/gdbserver/ChangeLog
gdb/gdbserver/Makefile.in
gdb/gdbsupport/gdb_vecs.h
gdb/gdbsupport/vec.c [deleted file]
gdb/gdbsupport/vec.h [deleted file]
gdb/gdbthread.h
gdb/guile/scm-type.c
gdb/inline-frame.c
gdb/machoread.c
gdb/memattr.c
gdb/memrange.h
gdb/namespace.h
gdb/nat/linux-btrace.h
gdb/osdata.c
gdb/parser-defs.h
gdb/progspace.h
gdb/python/py-type.c
gdb/record-btrace.c
gdb/rust-exp.y
gdb/solib-target.c
gdb/stap-probe.c
gdb/target-descriptions.c
gdb/target-memory.c
gdb/target.h
gdb/varobj.c
gdb/varobj.h
gdb/xml-support.h

index e6bd2464d0ae4030ea92e19d20d28869561f6f6d..8328a9b3c875aefddfd074f56ceb58cb6ef68e5a 100644 (file)
@@ -1,3 +1,44 @@
+2019-10-15  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * Makefile.in: Remove references to vec.h and vec.c.
+       * aarch64-tdep.c: No longer include vec.h.
+       * ada-lang.c: Likewise.
+       * ada-lang.h: Likewise.
+       * arm-tdep.c: Likewise.
+       * ax.h: Likewise.
+       * breakpoint.h: Likewise.
+       * charset.c: Likewise.
+       * cp-support.h: Likewise.
+       * dtrace-probe.c: Likewise.
+       * dwarf2read.c: Likewise.
+       * extension.h: Likewise.
+       * gdb_bfd.c: Likewise.
+       * gdbsupport/gdb_vecs.h: Likewise.
+       * gdbsupport/vec.c: Remove.
+       * gdbsupport/vec.h: Remove.
+       * gdbthread.h: Likewise.
+       * guile/scm-type.c: Likewise.
+       * inline-frame.c: Likewise.
+       * machoread.c: Likewise.
+       * memattr.c: Likewise.
+       * memrange.h: Likewise.
+       * namespace.h: Likewise.
+       * nat/linux-btrace.h: Likewise.
+       * osdata.c: Likewise.
+       * parser-defs.h: Likewise.
+       * progspace.h: Likewise.
+       * python/py-type.c: Likewise.
+       * record-btrace.c: Likewise.
+       * rust-exp.y: Likewise.
+       * solib-target.c: Likewise.
+       * stap-probe.c: Likewise.
+       * target-descriptions.c: Likewise.
+       * target-memory.c: Likewise.
+       * target.h: Likewise.
+       * varobj.c: Likewise.
+       * varobj.h: Likewise.
+       * xml-support.h: Likewise.
+
 2019-10-15  Andrew Burgess  <andrew.burgess@embecosm.com>
 
        * gdb/dwarf2read.c (dwarf2_per_objfile::~dwarf2_per_objfile):
index 36650ad555fa28e5bfe4f6966039ac6301d04c12..af4b14d6e6ca228e1eac5906e56ba9a0d13e5fbb 100644 (file)
@@ -980,7 +980,6 @@ COMMON_SFILES = \
        gdbsupport/signals.c \
        gdbsupport/signals-state-save-restore.c \
        gdbsupport/tdesc.c \
-       gdbsupport/vec.c \
        gdbsupport/xml-utils.c \
        complaints.c \
        completer.c \
@@ -1480,7 +1479,6 @@ HFILES_NO_SRCDIR = \
        gdbsupport/signals-state-save-restore.h \
        gdbsupport/symbol.h \
        gdbsupport/tdesc.h \
-       gdbsupport/vec.h \
        gdbsupport/version.h \
        gdbsupport/x86-xstate.h \
        gdbsupport/xml-utils.h \
index e512118579e198897d494bb5e85d1497a05b7bcb..d1ee78de094a6475442b0d194999b913b9763dec 100644 (file)
@@ -52,8 +52,6 @@
 #include "elf-bfd.h"
 #include "elf/aarch64.h"
 
-#include "gdbsupport/vec.h"
-
 #include "record.h"
 #include "record-full.h"
 #include "arch/aarch64-insn.h"
index 154f9850e27e7fe373706ef2f0da1dbeb5f83ac8..a2ae89dd98c8c4b2b22a9efc8eef0117e12347ee 100644 (file)
@@ -49,7 +49,6 @@
 #include "valprint.h"
 #include "source.h"
 #include "observable.h"
-#include "gdbsupport/vec.h"
 #include "stack.h"
 #include "gdbsupport/gdb_vecs.h"
 #include "typeprint.h"
index c7279d5ac39fbd7dcac688c956c647e5180fa36e..b68dd4e97d0c542b29b5a04e6ffee716bd22c8eb 100644 (file)
@@ -28,7 +28,6 @@ struct parser_state;
 #include "value.h"
 #include "gdbtypes.h"
 #include "breakpoint.h"
-#include "gdbsupport/vec.h"
 
 /* Names of specific files known to be part of the runtime
    system and that might consider (confusing) debugging information.
index c247052148029ae7dacda25e39ec8f18621eba51..5c1476af48b17f8a8d4d31169353ecf2b2a3b55b 100644 (file)
@@ -55,8 +55,6 @@
 #include "coff/internal.h"
 #include "elf/arm.h"
 
-#include "gdbsupport/vec.h"
-
 #include "record.h"
 #include "record-full.h"
 #include <algorithm>
index 112c21b6217606e7340dc793657f0a6787352bfe..e5bdbf621934bee71607106811840cf8dc1c27f1 100644 (file)
--- a/gdb/ax.h
+++ b/gdb/ax.h
@@ -19,8 +19,6 @@
 #ifndef AX_H
 #define AX_H
 
-#include "gdbsupport/vec.h"
-
 /* It's sometimes useful to be able to debug programs that you can't
    really stop for more than a fraction of a second.  To this end, the
    user can specify a tracepoint (like a breakpoint, but you don't
index 7472c0ecc45c7819e9880a585ee9ef3a3dc34425..da26f643a2d68a448f16869d8b2aa8f01728a5c6 100644 (file)
@@ -21,7 +21,6 @@
 
 #include "frame.h"
 #include "value.h"
-#include "gdbsupport/vec.h"
 #include "ax.h"
 #include "command.h"
 #include "gdbsupport/break-common.h"
index 73131651a6dbb652d925400a22d605353dcf51fd..7568e47cf9ab436bf2c28bbaecfd7a99ed393801 100644 (file)
@@ -23,7 +23,6 @@
 #include "gdb_obstack.h"
 #include "gdbsupport/gdb_wait.h"
 #include "charset-list.h"
-#include "gdbsupport/vec.h"
 #include "gdbsupport/environ.h"
 #include "arch-utils.h"
 #include "gdbsupport/gdb_vecs.h"
index 987850730ac10ddf559f5109a3a543f82ab06aa0..a2be977a8fdee9adcd70c33682e3491d358b1b75 100644 (file)
@@ -25,7 +25,6 @@
 /* We need this for 'domain_enum', alas...  */
 
 #include "symtab.h"
-#include "gdbsupport/vec.h"
 #include "gdbsupport/gdb_vecs.h"
 #include "gdb_obstack.h"
 #include "gdbsupport/array-view.h"
index e9e71fd4c9e82036dbf9464ed9393ea5580ca37c..9eaed2b9fc4508594cb65d158619bd507a28c212 100644 (file)
@@ -21,7 +21,6 @@
 
 #include "defs.h"
 #include "probe.h"
-#include "gdbsupport/vec.h"
 #include "elf-bfd.h"
 #include "gdbtypes.h"
 #include "obstack.h"
index ab3f43c7c5f8e9b6801751631270b150eac543d0..0443b55d8915a15df6ab7b9758c175b7db9fe0da 100644 (file)
@@ -55,7 +55,6 @@
 #include "addrmap.h"
 #include "typeprint.h"
 #include "psympriv.h"
-#include "gdbsupport/vec.h"
 #include "c-lang.h"
 #include "go-lang.h"
 #include "valprint.h"
index 581afc282dc71a0193c31215aa2933d95589d38c..fc8e3e2c0ba877f56e07ba555b7074d5398605aa 100644 (file)
@@ -21,7 +21,6 @@
 #define EXTENSION_H
 
 #include "mi/mi-cmds.h" /* For PRINT_NO_VALUES, etc.  */
-#include "gdbsupport/vec.h"
 #include "gdbsupport/array-view.h"
 
 struct breakpoint;
index 69618a27e1cc6c0e6d50ddec795956c9ed9afd97..2a070d7b929f2ce5fa4457a194e30fba2f432f19 100644 (file)
@@ -23,7 +23,6 @@
 #include "gdbcmd.h"
 #include "hashtab.h"
 #include "gdbsupport/filestuff.h"
-#include "gdbsupport/vec.h"
 #ifdef HAVE_MMAP
 #include <sys/mman.h>
 #ifndef MAP_FAILED
index 1b67a282fcf5b3ca74de5da4839ca1c395382994..402546b57ced202ad6981b4b679e3a0340a8f7cd 100644 (file)
@@ -1,3 +1,7 @@
+2019-10-15  Andrew Burgess  <andrew.burgess@embecosm.com>
+
+       * Makefile.in: Remove references to vec.c.
+
 2019-10-02  Christian Biesinger  <cbiesinger@google.com>
 
        * server.c (server_waiting): Change to bool.
index d79424b5ac32ac9bf7932dc7c152afa0a1063a68..c83cb3d3631997065a59626caf49dc3cca380965 100644 (file)
@@ -221,7 +221,6 @@ SFILES = \
        $(srcdir)/gdbsupport/ptid.c \
        $(srcdir)/gdbsupport/rsp-low.c \
        $(srcdir)/gdbsupport/tdesc.c \
-       $(srcdir)/gdbsupport/vec.c \
        $(srcdir)/gdbsupport/xml-utils.c \
        $(srcdir)/nat/aarch64-sve-linux-ptrace.c \
        $(srcdir)/nat/linux-btrace.c \
@@ -270,7 +269,6 @@ OBS = \
        gdbsupport/signals.o \
        gdbsupport/signals-state-save-restore.o \
        gdbsupport/tdesc.o \
-       gdbsupport/vec.o \
        gdbsupport/xml-utils.o \
        debug.o \
        dll.o \
index 017bf9383dc3c65c569701bab59f1554cb1cc866..e87ebe26e993bbc472b9c16d8c7fd5481415f685 100644 (file)
@@ -20,8 +20,6 @@
 #ifndef COMMON_GDB_VECS_H
 #define COMMON_GDB_VECS_H
 
-#include "vec.h"
-
 /* Split STR, a list of DELIMITER-separated fields, into a char pointer vector.
 
    You may modify the returned strings.  */
diff --git a/gdb/gdbsupport/vec.c b/gdb/gdbsupport/vec.c
deleted file mode 100644 (file)
index a889544..0000000
+++ /dev/null
@@ -1,118 +0,0 @@
-/* Vector API for GDB.
-   Copyright (C) 2004-2019 Free Software Foundation, Inc.
-   Contributed by Nathan Sidwell <nathan@codesourcery.com>
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#include "common-defs.h"
-#include "vec.h"
-
-struct vec_prefix
-{
-  unsigned num;
-  unsigned alloc;
-  void *vec[1];
-};
-
-/* Calculate the new ALLOC value, making sure that abs(RESERVE) slots
-   are free.  If RESERVE < 0 grow exactly, otherwise grow
-   exponentially.  */
-
-static inline unsigned
-calculate_allocation (const struct vec_prefix *pfx, int reserve)
-{
-  unsigned alloc = 0;
-  unsigned num = 0;
-
-  if (pfx)
-    {
-      alloc = pfx->alloc;
-      num = pfx->num;
-    }
-  else if (!reserve)
-    /* If there's no prefix, and we've not requested anything, then we
-       will create a NULL vector.  */
-    return 0;
-
-  /* We must have run out of room.  */
-  gdb_assert (alloc - num < (unsigned)(reserve < 0 ? -reserve : reserve));
-
-  if (reserve < 0)
-    /* Exact size.  */
-    alloc = num + -reserve;
-  else
-    {
-      /* Exponential growth.  */
-      if (!alloc)
-       alloc = 4;
-      else if (alloc < 16)
-       /* Double when small.  */
-       alloc = alloc * 2;
-      else
-       /* Grow slower when large.  */
-       alloc = (alloc * 3 / 2);
-
-      /* If this is still too small, set it to the right size.  */
-      if (alloc < num + reserve)
-       alloc = num + reserve;
-    }
-  return alloc;
-}
-
-/* Ensure there are at least abs(RESERVE) free slots in VEC.  If
-   RESERVE < 0 grow exactly, else grow exponentially.  As a special
-   case, if VEC is NULL, and RESERVE is 0, no vector will be created.  */
-
-void *
-vec_p_reserve (void *vec, int reserve)
-{
-  return vec_o_reserve (vec, reserve,
-                       offsetof (struct vec_prefix, vec), sizeof (void *));
-}
-
-/* As vec_p_reserve, but for object vectors.  The vector's trailing
-   array is at VEC_OFFSET offset and consists of ELT_SIZE sized
-   elements.  */
-
-void *
-vec_o_reserve (void *vec, int reserve, size_t vec_offset, size_t elt_size)
-{
-  struct vec_prefix *pfx = (struct vec_prefix *) vec;
-  unsigned alloc = calculate_allocation (pfx, reserve);
-
-  if (!alloc)
-    return NULL;
-
-  vec = xrealloc (vec, vec_offset + alloc * elt_size);
-  ((struct vec_prefix *)vec)->alloc = alloc;
-  if (!pfx)
-    ((struct vec_prefix *)vec)->num = 0;
-
-  return vec;
-}
-
-#if 0
-/* Example uses.  */
-DEF_VEC_I (int);
-typedef struct X
-{
-  int i;
-} obj_t;
-typedef obj_t *ptr_t;
-
-DEF_VEC_P (ptr_t);
-DEF_VEC_O (obj_t);
-#endif
diff --git a/gdb/gdbsupport/vec.h b/gdb/gdbsupport/vec.h
deleted file mode 100644 (file)
index 8ac146d..0000000
+++ /dev/null
@@ -1,1150 +0,0 @@
-/* Vector API for GDB.
-   Copyright (C) 2004-2019 Free Software Foundation, Inc.
-   Contributed by Nathan Sidwell <nathan@codesourcery.com>
-
-   This file is part of GDB.
-
-   This program is free software; you can redistribute it and/or modify
-   it under the terms of the GNU General Public License as published by
-   the Free Software Foundation; either version 3 of the License, or
-   (at your option) any later version.
-
-   This program is distributed in the hope that it will be useful,
-   but WITHOUT ANY WARRANTY; without even the implied warranty of
-   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-   GNU General Public License for more details.
-
-   You should have received a copy of the GNU General Public License
-   along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
-
-#ifndef COMMON_VEC_H
-#define COMMON_VEC_H
-
-#include "diagnostics.h"
-
-/* clang has a bug that makes it warn (-Wunused-function) about unused functions
-   that are the result of the DEF_VEC_* macro expansion.  See:
-
-     https://bugs.llvm.org/show_bug.cgi?id=22712
-
-   We specifically ignore this warning for the vec functions when the compiler
-   is clang.  */
-#ifdef __clang__
-# define DIAGNOSTIC_IGNORE_UNUSED_VEC_FUNCTION \
-    DIAGNOSTIC_IGNORE_UNUSED_FUNCTION
-#else
-# define DIAGNOSTIC_IGNORE_UNUSED_VEC_FUNCTION
-#endif
-
-/* 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.
-
-   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.
-
-   The vectors are implemented using the trailing array idiom, thus
-   they are not resizeable without changing the address of the vector
-   object itself.  This means you cannot have variables or fields of
-   vector type -- always use a pointer to a vector.  The one exception
-   is the final field of a structure, which could be a vector type.
-   You will have to use the embedded_size & embedded_init calls to
-   create such objects, and they will probably not be resizeable (so
-   don't use the 'safe' allocation variants).  The trailing array
-   idiom is used (rather than a pointer to an array of data), because,
-   if we allow NULL to also represent an empty vector, empty vectors
-   occupy minimal space in the structure containing them.
-
-   Each operation that increases the number of active elements is
-   available in 'quick' and 'safe' variants.  The former presumes that
-   there is sufficient allocated space for the operation to succeed
-   (it dies if there is not).  The latter will reallocate the
-   vector, if needed.  Reallocation causes an exponential increase in
-   vector size.  If you know you will be adding N elements, it would
-   be more efficient to use the reserve operation before adding the
-   elements with the 'quick' operation.  This will ensure there are at
-   least as many elements as you ask for, it will exponentially
-   increase if there are too few spare slots.  If you want reserve a
-   specific number of slots, but do not want the exponential increase
-   (for instance, you know this is the last allocation), use a
-   negative number for reservation.  You can also create a vector of a
-   specific size from the get go.
-
-   You should prefer the push and pop operations, as they append and
-   remove from the end of the vector.  If you need to remove several
-   items in one go, use the truncate operation.  The insert and remove
-   operations allow you to change elements in the middle of the
-   vector.  There are two remove operations, one which preserves the
-   element ordering 'ordered_remove', and one which does not
-   'unordered_remove'.  The latter function copies the end element
-   into the removed slot, rather than invoke a memmove operation.  The
-   'lower_bound' function will determine where to place an item in the
-   array using insert that will maintain sorted order.
-
-   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,P,I}(TYPEDEF) macro.
-   Variables of vector type are declared using a VEC(TYPEDEF) macro.
-   The characters O, P and I indicate whether TYPEDEF is a pointer
-   (P), object (O) 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.  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.
-
-   An example of their use would be,
-
-   DEF_VEC_P(tree);   // non-managed tree vector.
-
-   struct my_struct {
-     VEC(tree) *v;      // A (pointer to) a vector of tree pointers.
-   };
-
-   struct my_struct *s;
-
-   if (VEC_length(tree, s->v)) { we have some contents }
-   VEC_safe_push(tree, s->v, decl); // append some decl onto the end
-   for (ix = 0; VEC_iterate(tree, s->v, ix, elt); ix++)
-     { do something with elt }
-
-*/
-
-/* 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.
-   Some of these macros pass the vector, V, by reference (by taking
-   its address), this is noted in the descriptions.  */
-
-/* Length of vector
-   unsigned VEC_T_length(const VEC(T) *v);
-
-   Return the number of active elements in V.  V can be NULL, in which
-   case zero is returned.  */
-
-#define VEC_length(T,V)        (VEC_OP(T,length)(V))
-
-
-/* Check if vector is empty
-   int VEC_T_empty(const VEC(T) *v);
-
-   Return nonzero if V is an empty vector (or V is NULL), zero otherwise.  */
-
-#define VEC_empty(T,V) (VEC_length (T,V) == 0)
-
-
-/* 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 the final element.  V must not be empty.  */
-
-#define VEC_last(T,V)  (VEC_OP(T,last)(V VEC_ASSERT_INFO))
-
-/* 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
-
-   Return the IX'th element.  If IX must be in the domain of V.  */
-
-#define VEC_index(T,V,I) (VEC_OP(T,index)(V,I VEC_ASSERT_INFO))
-
-/* 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,
-
-     for (ix = 0; VEC_iterate(T,v,ix,ptr); ix++)
-       continue;  */
-
-#define VEC_iterate(T,V,I,P)   (VEC_OP(T,iterate)(V,I,&(P)))
-
-/* Allocate new vector.
-   VEC(T,A) *VEC_T_alloc(int reserve);
-
-   Allocate a new vector with space for RESERVE objects.  If RESERVE
-   is zero, NO vector is created.  */
-
-#define VEC_alloc(T,N) (VEC_OP(T,alloc)(N))
-
-/* Free a vector.
-   void VEC_T_free(VEC(T,A) *&);
-
-   Free a vector and set it to NULL.  */
-
-#define VEC_free(T,V)  (VEC_OP(T,free)(&V))
-
-/* A cleanup function for a vector.
-   void VEC_T_cleanup(void *);
-   
-   Clean up a vector.  */
-
-#define VEC_cleanup(T) (VEC_OP(T,cleanup))
-
-/* Use these to determine the required size and initialization of a
-   vector embedded within another structure (as the final member).
-
-   size_t VEC_T_embedded_size(int reserve);
-   void VEC_T_embedded_init(VEC(T) *v, int reserve);
-
-   These allow the caller to perform the memory allocation.  */
-
-#define VEC_embedded_size(T,N)  (VEC_OP(T,embedded_size)(N))
-#define VEC_embedded_init(T,O,N) (VEC_OP(T,embedded_init)(VEC_BASE(O),N))
-
-/* Copy a vector.
-   VEC(T,A) *VEC_T_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.  */
-
-#define VEC_copy(T,V) (VEC_OP(T,copy)(V))
-
-/* Merge two vectors.
-   VEC(T,A) *VEC_T_merge(VEC(T) *, VEC(T) *);
-
-   Copy the live elements of both vectors into a new vector.  The new
-   and old vectors need not be allocated by the same mechanism.  */
-#define VEC_merge(T,V1,V2) (VEC_OP(T,merge)(V1, V2))
-
-/* Determine if a vector has additional capacity.
-
-   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
-   will.  */
-
-#define VEC_space(T,V,R) (VEC_OP(T,space)(V,R VEC_ASSERT_INFO))
-
-/* Reserve space.
-   int VEC_T_reserve(VEC(T,A) *&v, int reserve);
-
-   Ensure that V has at least abs(RESERVE) slots available.  The
-   signedness of RESERVE determines the reallocation behavior.  A
-   negative value will not create additional headroom beyond that
-   requested.  A positive value will create additional headroom.  Note
-   this can cause V to be reallocated.  Returns nonzero iff
-   reallocation actually occurred.  */
-
-#define VEC_reserve(T,V,R) (VEC_OP(T,reserve)(&(V),R VEC_ASSERT_INFO))
-
-/* 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_OP(T,quick_push)(V,O VEC_ASSERT_INFO))
-
-/* Push object with reallocation
-   T *VEC_T_safe_push (VEC(T,A) *&v, T obj); // Integer
-   T *VEC_T_safe_push (VEC(T,A) *&v, T obj); // Pointer
-   T *VEC_T_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.  */
-
-#define VEC_safe_push(T,V,O) (VEC_OP(T,safe_push)(&(V),O VEC_ASSERT_INFO))
-
-/* 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 the last element off the end.  Returns the element popped, for
-   pointer vectors.  */
-
-#define VEC_pop(T,V)   (VEC_OP(T,pop)(V VEC_ASSERT_INFO))
-
-/* 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_OP(T,truncate)(V,I VEC_ASSERT_INFO))
-
-/* Grow to a specific length.
-   void VEC_T_safe_grow (VEC(T,A) *&v, int len);
-
-   Grow the vector 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,V,I)           \
-       (VEC_OP(T,safe_grow)(&(V),I VEC_ASSERT_INFO))
-
-/* 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_OP(T,replace)(V,I,O VEC_ASSERT_INFO))
-
-/* Insert object with no reallocation
-   T *VEC_T_quick_insert (VEC(T) *v, unsigned ix, T val); // Integer
-   T *VEC_T_quick_insert (VEC(T) *v, unsigned ix, T val); // Pointer
-   T *VEC_T_quick_insert (VEC(T) *v, unsigned ix, T *val); // Object
-
-   Insert an element, VAL, at the IXth position of V.  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.  There must be sufficient space.  */
-
-#define VEC_quick_insert(T,V,I,O) \
-       (VEC_OP(T,quick_insert)(V,I,O VEC_ASSERT_INFO))
-
-/* Insert object with reallocation
-   T *VEC_T_safe_insert (VEC(T,A) *&v, unsigned ix, T val); // Integer
-   T *VEC_T_safe_insert (VEC(T,A) *&v, unsigned ix, T val); // Pointer
-   T *VEC_T_safe_insert (VEC(T,A) *&v, unsigned ix, T *val); // Object
-
-   Insert an element, VAL, at the IXth position of V.  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,V,I,O)       \
-       (VEC_OP(T,safe_insert)(&(V),I,O VEC_ASSERT_INFO))
-
-/* Remove element retaining order
-   T VEC_T_ordered_remove (VEC(T) *v, unsigned ix); // Integer
-   T 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
-   remaining elements is preserved.  For pointer vectors returns the
-   removed object.  This is an O(N) operation due to a memmove.  */
-
-#define VEC_ordered_remove(T,V,I)      \
-       (VEC_OP(T,ordered_remove)(V,I VEC_ASSERT_INFO))
-
-/* Remove element destroying order
-   T VEC_T_unordered_remove (VEC(T) *v, unsigned ix); // Integer
-   T 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
-   remaining elements is destroyed.  For pointer vectors returns the
-   removed object.  This is an O(1) operation.  */
-
-#define VEC_unordered_remove(T,V,I)    \
-       (VEC_OP(T,unordered_remove)(V,I VEC_ASSERT_INFO))
-
-/* 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.
-   This is an O(N) operation due to memmove.  */
-
-#define VEC_block_remove(T,V,I,L)      \
-       (VEC_OP(T,block_remove)(V,I,L VEC_ASSERT_INFO))
-
-/* Get the address of the array of elements
-   T *VEC_T_address (VEC(T) v)
-
-   If you need to directly manipulate the array (for instance, you
-   want to feed it to qsort), use this accessor.  */
-
-#define VEC_address(T,V)               (VEC_OP(T,address)(V))
-
-/* Find the first index in the vector not less than the object.
-   unsigned VEC_T_lower_bound (VEC(T) *v, const T val,
-                               int (*lessthan) (const T, const T)); // Integer
-   unsigned VEC_T_lower_bound (VEC(T) *v, const T val,
-                               int (*lessthan) (const T, const T)); // Pointer
-   unsigned VEC_T_lower_bound (VEC(T) *v, const T *val,
-                               int (*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_OP(T,lower_bound)(V,O,LT VEC_ASSERT_INFO))
-
-/* Reallocate an array of elements with prefix.  */
-extern void *vec_p_reserve (void *, int);
-extern void *vec_o_reserve (void *, int, size_t, size_t);
-#define vec_free_(V) xfree (V)
-
-#define VEC_ASSERT_INFO ,__FILE__,__LINE__
-#define VEC_ASSERT_DECL ,const char *file_,unsigned line_
-#define VEC_ASSERT_PASS ,file_,line_
-#define vec_assert(expr, op) \
-  ((void)((expr) ? 0 : (gdb_assert_fail (op, file_, line_, \
-                                        FUNCTION_NAME), 0)))
-
-#define VEC(T) VEC_##T
-#define VEC_OP(T,OP) VEC_##T##_##OP
-
-#define VEC_T(T)                                                         \
-typedef struct VEC(T)                                                    \
-{                                                                        \
-  unsigned num;                                                                  \
-  unsigned alloc;                                                        \
-  T vec[1];                                                              \
-} VEC(T)
-
-/* Vector of integer-like object.  */
-#define DEF_VEC_I(T)                                                     \
-DIAGNOSTIC_PUSH                                                          \
-DIAGNOSTIC_IGNORE_UNUSED_VEC_FUNCTION                                    \
-static inline void VEC_OP (T,must_be_integral_type) (void)               \
-{                                                                        \
-  (void)~(T)0;                                                           \
-}                                                                        \
-                                                                         \
-VEC_T(T);                                                                \
-DEF_VEC_FUNC_P(T)                                                        \
-DEF_VEC_ALLOC_FUNC_I(T)                                                          \
-DIAGNOSTIC_POP                                                           \
-struct vec_swallow_trailing_semi
-
-/* Vector of pointer to object.  */
-#define DEF_VEC_P(T)                                                     \
-DIAGNOSTIC_PUSH                                                          \
-DIAGNOSTIC_IGNORE_UNUSED_VEC_FUNCTION                                    \
-static inline void VEC_OP (T,must_be_pointer_type) (void)                \
-{                                                                        \
-  (void)((T)1 == (void *)1);                                             \
-}                                                                        \
-                                                                         \
-VEC_T(T);                                                                \
-DEF_VEC_FUNC_P(T)                                                        \
-DEF_VEC_ALLOC_FUNC_P(T)                                                          \
-DIAGNOSTIC_POP                                                           \
-struct vec_swallow_trailing_semi
-
-/* Vector of object.  */
-#define DEF_VEC_O(T)                                                     \
-DIAGNOSTIC_PUSH                                                          \
-DIAGNOSTIC_IGNORE_UNUSED_VEC_FUNCTION                                    \
-VEC_T(T);                                                                \
-DEF_VEC_FUNC_O(T)                                                        \
-DEF_VEC_ALLOC_FUNC_O(T)                                                          \
-DIAGNOSTIC_POP                                                           \
-struct vec_swallow_trailing_semi
-
-/* Avoid offsetof (or its usual C implementation) as it triggers
-   -Winvalid-offsetof warnings with enum_flags types with G++ <= 4.4,
-   even though those types are memcpyable.  This requires allocating a
-   dummy local VEC in all routines that use this, but that has the
-   advantage that it only works if T is default constructible, which
-   is exactly a check we want, to keep C compatibility.  */
-#define vec_offset(T, VPTR) ((size_t) ((char *) &(VPTR)->vec - (char *) VPTR))
-
-#define DEF_VEC_ALLOC_FUNC_I(T)                                                  \
-static inline VEC(T) *VEC_OP (T,alloc)                                   \
-     (int alloc_)                                                        \
-{                                                                        \
-  VEC(T) dummy;                                                                  \
-                                                                         \
-  /* We must request exact size allocation, hence the negation.  */      \
-  return (VEC(T) *) vec_o_reserve (NULL, -alloc_,                        \
-                                   vec_offset (T, &dummy), sizeof (T));          \
-}                                                                        \
-                                                                         \
-static inline VEC(T) *VEC_OP (T,copy) (VEC(T) *vec_)                     \
-{                                                                        \
-  size_t len_ = vec_ ? vec_->num : 0;                                    \
-  VEC (T) *new_vec_ = NULL;                                              \
-                                                                         \
-  if (len_)                                                              \
-    {                                                                    \
-      VEC(T) dummy;                                                      \
-                                                                         \
-      /* We must request exact size allocation, hence the negation.  */          \
-      new_vec_ = (VEC (T) *)                                             \
-       vec_o_reserve (NULL, -len_, vec_offset (T, &dummy), sizeof (T));        \
-                                                                         \
-      new_vec_->num = len_;                                              \
-      memcpy (new_vec_->vec, vec_->vec, sizeof (T) * len_);              \
-    }                                                                    \
-  return new_vec_;                                                       \
-}                                                                        \
-                                                                         \
-static inline VEC(T) *VEC_OP (T,merge) (VEC(T) *vec1_, VEC(T) *vec2_)    \
-{                                                                        \
-  if (vec1_ && vec2_)                                                    \
-    {                                                                    \
-      VEC(T) dummy;                                                      \
-      size_t len_ = vec1_->num + vec2_->num;                             \
-      VEC (T) *new_vec_ = NULL;                                                  \
-                                                                         \
-      /* We must request exact size allocation, hence the negation.  */          \
-      new_vec_ = (VEC (T) *)                                             \
-       vec_o_reserve (NULL, -len_, vec_offset (T, &dummy), sizeof (T));          \
-                                                                         \
-      new_vec_->num = len_;                                              \
-      memcpy (new_vec_->vec, vec1_->vec, sizeof (T) * vec1_->num);       \
-      memcpy (new_vec_->vec + vec1_->num, vec2_->vec,                    \
-             sizeof (T) * vec2_->num);                                   \
-                                                                         \
-      return new_vec_;                                                   \
-    }                                                                    \
-  else                                                                   \
-    return VEC_copy (T, vec1_ ? vec1_ : vec2_);                                  \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,free)                                       \
-     (VEC(T) **vec_)                                                     \
-{                                                                        \
-  if (*vec_)                                                             \
-    vec_free_ (*vec_);                                                   \
-  *vec_ = NULL;                                                                  \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,cleanup)                                    \
-     (void *arg_)                                                        \
-{                                                                        \
-  VEC(T) **vec_ = (VEC(T) **) arg_;                                      \
-  if (*vec_)                                                             \
-    vec_free_ (*vec_);                                                   \
-  *vec_ = NULL;                                                                  \
-}                                                                        \
-                                                                         \
-static inline int VEC_OP (T,reserve)                                     \
-     (VEC(T) **vec_, int alloc_ VEC_ASSERT_DECL)                         \
-{                                                                        \
-  VEC(T) dummy;                                                                  \
-  int extend = !VEC_OP (T,space)                                         \
-       (*vec_, alloc_ < 0 ? -alloc_ : alloc_ VEC_ASSERT_PASS);           \
-                                                                         \
-  if (extend)                                                            \
-    *vec_ = (VEC(T) *) vec_o_reserve (*vec_, alloc_,                     \
-                                     vec_offset (T, &dummy), sizeof (T)); \
-                                                                         \
-  return extend;                                                         \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,safe_grow)                                          \
-     (VEC(T) **vec_, int size_ VEC_ASSERT_DECL)                                  \
-{                                                                        \
-  vec_assert (size_ >= 0 && VEC_OP(T,length) (*vec_) <= (unsigned)size_,  \
-       "safe_grow");                                                     \
-  VEC_OP (T,reserve) (vec_, (int)(*vec_ ? (*vec_)->num : 0) - size_      \
-                       VEC_ASSERT_PASS);                                 \
-  (*vec_)->num = size_;                                                          \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,safe_push)                                    \
-     (VEC(T) **vec_, const T obj_ VEC_ASSERT_DECL)                       \
-{                                                                        \
-  VEC_OP (T,reserve) (vec_, 1 VEC_ASSERT_PASS);                                  \
-                                                                         \
-  return VEC_OP (T,quick_push) (*vec_, obj_ VEC_ASSERT_PASS);            \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,safe_insert)                                          \
-     (VEC(T) **vec_, unsigned ix_, const T obj_ VEC_ASSERT_DECL)         \
-{                                                                        \
-  VEC_OP (T,reserve) (vec_, 1 VEC_ASSERT_PASS);                                  \
-                                                                         \
-  return VEC_OP (T,quick_insert) (*vec_, ix_, obj_ VEC_ASSERT_PASS);     \
-}
-
-#define DEF_VEC_FUNC_P(T)                                                \
-static inline unsigned VEC_OP (T,length) (const VEC(T) *vec_)            \
-{                                                                        \
-  return vec_ ? vec_->num : 0;                                           \
-}                                                                        \
-                                                                         \
-static inline T VEC_OP (T,last)                                                  \
-       (const VEC(T) *vec_ VEC_ASSERT_DECL)                              \
-{                                                                        \
-  vec_assert (vec_ && vec_->num, "last");                                \
-                                                                         \
-  return vec_->vec[vec_->num - 1];                                       \
-}                                                                        \
-                                                                         \
-static inline T VEC_OP (T,index)                                         \
-     (const VEC(T) *vec_, unsigned ix_ VEC_ASSERT_DECL)                          \
-{                                                                        \
-  vec_assert (vec_ && ix_ < vec_->num, "index");                         \
-                                                                         \
-  return vec_->vec[ix_];                                                 \
-}                                                                        \
-                                                                         \
-static inline int VEC_OP (T,iterate)                                     \
-     (const VEC(T) *vec_, unsigned ix_, T *ptr)                                  \
-{                                                                        \
-  if (vec_ && ix_ < vec_->num)                                           \
-    {                                                                    \
-      *ptr = vec_->vec[ix_];                                             \
-      return 1;                                                                  \
-    }                                                                    \
-  else                                                                   \
-    {                                                                    \
-      *ptr = (T) 0;                                                      \
-      return 0;                                                                  \
-    }                                                                    \
-}                                                                        \
-                                                                         \
-static inline size_t VEC_OP (T,embedded_size)                            \
-     (int alloc_)                                                        \
-{                                                                        \
-  VEC(T) dummy;                                                                  \
-                                                                         \
-  return vec_offset (T, &dummy) + alloc_ * sizeof(T);                    \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,embedded_init)                              \
-     (VEC(T) *vec_, int alloc_)                                                  \
-{                                                                        \
-  vec_->num = 0;                                                         \
-  vec_->alloc = alloc_;                                                          \
-}                                                                        \
-                                                                         \
-static inline int VEC_OP (T,space)                                       \
-     (VEC(T) *vec_, int alloc_ VEC_ASSERT_DECL)                                  \
-{                                                                        \
-  vec_assert (alloc_ >= 0, "space");                                     \
-  return vec_ ? vec_->alloc - vec_->num >= (unsigned)alloc_ : !alloc_;   \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,quick_push)                                   \
-     (VEC(T) *vec_, T obj_ VEC_ASSERT_DECL)                              \
-{                                                                        \
-  T *slot_;                                                              \
-                                                                         \
-  vec_assert (vec_->num < vec_->alloc, "quick_push");                    \
-  slot_ = &vec_->vec[vec_->num++];                                       \
-  *slot_ = obj_;                                                         \
-                                                                         \
-  return slot_;                                                                  \
-}                                                                        \
-                                                                         \
-static inline T VEC_OP (T,pop) (VEC(T) *vec_ VEC_ASSERT_DECL)            \
-{                                                                        \
-  T obj_;                                                                \
-                                                                         \
-  vec_assert (vec_->num, "pop");                                         \
-  obj_ = vec_->vec[--vec_->num];                                         \
-                                                                         \
-  return obj_;                                                           \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,truncate)                                   \
-     (VEC(T) *vec_, unsigned size_ VEC_ASSERT_DECL)                      \
-{                                                                        \
-  vec_assert (vec_ ? vec_->num >= size_ : !size_, "truncate");           \
-  if (vec_)                                                              \
-    vec_->num = size_;                                                   \
-}                                                                        \
-                                                                         \
-static inline T VEC_OP (T,replace)                                       \
-     (VEC(T) *vec_, unsigned ix_, T obj_ VEC_ASSERT_DECL)                \
-{                                                                        \
-  T old_obj_;                                                            \
-                                                                         \
-  vec_assert (ix_ < vec_->num, "replace");                               \
-  old_obj_ = vec_->vec[ix_];                                             \
-  vec_->vec[ix_] = obj_;                                                 \
-                                                                         \
-  return old_obj_;                                                       \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,quick_insert)                                 \
-     (VEC(T) *vec_, unsigned ix_, T obj_ VEC_ASSERT_DECL)                \
-{                                                                        \
-  T *slot_;                                                              \
-                                                                         \
-  vec_assert (vec_->num < vec_->alloc && ix_ <= vec_->num, "quick_insert"); \
-  slot_ = &vec_->vec[ix_];                                               \
-  memmove (slot_ + 1, slot_, (vec_->num++ - ix_) * sizeof (T));                  \
-  *slot_ = obj_;                                                         \
-                                                                         \
-  return slot_;                                                                  \
-}                                                                        \
-                                                                         \
-static inline T VEC_OP (T,ordered_remove)                                \
-     (VEC(T) *vec_, unsigned ix_ VEC_ASSERT_DECL)                        \
-{                                                                        \
-  T *slot_;                                                              \
-  T obj_;                                                                \
-                                                                         \
-  vec_assert (ix_ < vec_->num, "ordered_remove");                        \
-  slot_ = &vec_->vec[ix_];                                               \
-  obj_ = *slot_;                                                         \
-  memmove (slot_, slot_ + 1, (--vec_->num - ix_) * sizeof (T));                  \
-                                                                         \
-  return obj_;                                                           \
-}                                                                        \
-                                                                         \
-static inline T VEC_OP (T,unordered_remove)                              \
-     (VEC(T) *vec_, unsigned ix_ VEC_ASSERT_DECL)                        \
-{                                                                        \
-  T *slot_;                                                              \
-  T obj_;                                                                \
-                                                                         \
-  vec_assert (ix_ < vec_->num, "unordered_remove");                      \
-  slot_ = &vec_->vec[ix_];                                               \
-  obj_ = *slot_;                                                         \
-  *slot_ = vec_->vec[--vec_->num];                                       \
-                                                                         \
-  return obj_;                                                           \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,block_remove)                               \
-     (VEC(T) *vec_, unsigned ix_, unsigned len_ VEC_ASSERT_DECL)         \
-{                                                                        \
-  T *slot_;                                                              \
-                                                                         \
-  vec_assert (ix_ + len_ <= vec_->num, "block_remove");                          \
-  slot_ = &vec_->vec[ix_];                                               \
-  vec_->num -= len_;                                                     \
-  memmove (slot_, slot_ + len_, (vec_->num - ix_) * sizeof (T));         \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,address)                                      \
-     (VEC(T) *vec_)                                                      \
-{                                                                        \
-  return vec_ ? vec_->vec : 0;                                           \
-}                                                                        \
-                                                                         \
-static inline unsigned VEC_OP (T,lower_bound)                            \
-     (VEC(T) *vec_, const T obj_,                                        \
-      int (*lessthan_)(const T, const T) VEC_ASSERT_DECL)                \
-{                                                                        \
-   unsigned int len_ = VEC_OP (T, length) (vec_);                        \
-   unsigned int half_, middle_;                                                  \
-   unsigned int first_ = 0;                                              \
-   while (len_ > 0)                                                      \
-     {                                                                   \
-        T middle_elem_;                                                          \
-        half_ = len_ >> 1;                                               \
-        middle_ = first_;                                                \
-        middle_ += half_;                                                \
-        middle_elem_ = VEC_OP (T,index) (vec_, middle_ VEC_ASSERT_PASS);  \
-        if (lessthan_ (middle_elem_, obj_))                              \
-          {                                                              \
-             first_ = middle_;                                           \
-             ++first_;                                                   \
-             len_ = len_ - half_ - 1;                                    \
-          }                                                              \
-        else                                                             \
-          len_ = half_;                                                          \
-     }                                                                   \
-   return first_;                                                        \
-}
-
-#define DEF_VEC_ALLOC_FUNC_P(T)                                                  \
-static inline VEC(T) *VEC_OP (T,alloc)                                   \
-     (int alloc_)                                                        \
-{                                                                        \
-  /* We must request exact size allocation, hence the negation.  */      \
-  return (VEC(T) *) vec_p_reserve (NULL, -alloc_);                       \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,free)                                       \
-     (VEC(T) **vec_)                                                     \
-{                                                                        \
-  if (*vec_)                                                             \
-    vec_free_ (*vec_);                                                   \
-  *vec_ = NULL;                                                                  \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,cleanup)                                    \
-     (void *arg_)                                                        \
-{                                                                        \
-  VEC(T) **vec_ = (VEC(T) **) arg_;                                      \
-  if (*vec_)                                                             \
-    vec_free_ (*vec_);                                                   \
-  *vec_ = NULL;                                                                  \
-}                                                                        \
-                                                                         \
-static inline VEC(T) *VEC_OP (T,copy) (VEC(T) *vec_)                     \
-{                                                                        \
-  size_t len_ = vec_ ? vec_->num : 0;                                    \
-  VEC (T) *new_vec_ = NULL;                                              \
-                                                                         \
-  if (len_)                                                              \
-    {                                                                    \
-      /* We must request exact size allocation, hence the negation.  */          \
-      new_vec_ = (VEC (T) *)(vec_p_reserve (NULL, -len_));               \
-                                                                         \
-      new_vec_->num = len_;                                              \
-      memcpy (new_vec_->vec, vec_->vec, sizeof (T) * len_);              \
-    }                                                                    \
-  return new_vec_;                                                       \
-}                                                                        \
-                                                                         \
-static inline VEC(T) *VEC_OP (T,merge) (VEC(T) *vec1_, VEC(T) *vec2_)    \
-{                                                                        \
-  if (vec1_ && vec2_)                                                    \
-    {                                                                    \
-      size_t len_ = vec1_->num + vec2_->num;                             \
-      VEC (T) *new_vec_ = NULL;                                                  \
-                                                                         \
-      /* We must request exact size allocation, hence the negation.  */          \
-      new_vec_ = (VEC (T) *)(vec_p_reserve (NULL, -len_));               \
-                                                                         \
-      new_vec_->num = len_;                                              \
-      memcpy (new_vec_->vec, vec1_->vec, sizeof (T) * vec1_->num);       \
-      memcpy (new_vec_->vec + vec1_->num, vec2_->vec,                    \
-             sizeof (T) * vec2_->num);                                   \
-                                                                         \
-      return new_vec_;                                                   \
-    }                                                                    \
-  else                                                                   \
-    return VEC_copy (T, vec1_ ? vec1_ : vec2_);                                  \
-}                                                                        \
-                                                                         \
-static inline int VEC_OP (T,reserve)                                     \
-     (VEC(T) **vec_, int alloc_ VEC_ASSERT_DECL)                         \
-{                                                                        \
-  int extend = !VEC_OP (T,space)                                         \
-       (*vec_, alloc_ < 0 ? -alloc_ : alloc_ VEC_ASSERT_PASS);           \
-                                                                         \
-  if (extend)                                                            \
-    *vec_ = (VEC(T) *) vec_p_reserve (*vec_, alloc_);                    \
-                                                                         \
-  return extend;                                                         \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,safe_grow)                                          \
-     (VEC(T) **vec_, int size_ VEC_ASSERT_DECL)                                  \
-{                                                                        \
-  vec_assert (size_ >= 0 && VEC_OP(T,length) (*vec_) <= (unsigned)size_,  \
-       "safe_grow");                                                     \
-  VEC_OP (T,reserve)                                                     \
-       (vec_, (int)(*vec_ ? (*vec_)->num : 0) - size_ VEC_ASSERT_PASS);  \
-  (*vec_)->num = size_;                                                          \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,safe_push)                                    \
-     (VEC(T) **vec_, T obj_ VEC_ASSERT_DECL)                             \
-{                                                                        \
-  VEC_OP (T,reserve) (vec_, 1 VEC_ASSERT_PASS);                                  \
-                                                                         \
-  return VEC_OP (T,quick_push) (*vec_, obj_ VEC_ASSERT_PASS);            \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,safe_insert)                                          \
-     (VEC(T) **vec_, unsigned ix_, T obj_ VEC_ASSERT_DECL)               \
-{                                                                        \
-  VEC_OP (T,reserve) (vec_, 1 VEC_ASSERT_PASS);                                  \
-                                                                         \
-  return VEC_OP (T,quick_insert) (*vec_, ix_, obj_ VEC_ASSERT_PASS);     \
-}
-
-#define DEF_VEC_FUNC_O(T)                                                \
-static inline unsigned VEC_OP (T,length) (const VEC(T) *vec_)            \
-{                                                                        \
-  return vec_ ? vec_->num : 0;                                           \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,last) (VEC(T) *vec_ VEC_ASSERT_DECL)                  \
-{                                                                        \
-  vec_assert (vec_ && vec_->num, "last");                                \
-                                                                         \
-  return &vec_->vec[vec_->num - 1];                                      \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,index)                                        \
-     (VEC(T) *vec_, unsigned ix_ VEC_ASSERT_DECL)                        \
-{                                                                        \
-  vec_assert (vec_ && ix_ < vec_->num, "index");                         \
-                                                                         \
-  return &vec_->vec[ix_];                                                \
-}                                                                        \
-                                                                         \
-static inline int VEC_OP (T,iterate)                                     \
-     (VEC(T) *vec_, unsigned ix_, T **ptr)                               \
-{                                                                        \
-  if (vec_ && ix_ < vec_->num)                                           \
-    {                                                                    \
-      *ptr = &vec_->vec[ix_];                                            \
-      return 1;                                                                  \
-    }                                                                    \
-  else                                                                   \
-    {                                                                    \
-      *ptr = 0;                                                                  \
-      return 0;                                                                  \
-    }                                                                    \
-}                                                                        \
-                                                                         \
-static inline size_t VEC_OP (T,embedded_size)                            \
-     (int alloc_)                                                        \
-{                                                                        \
-  VEC(T) dummy;                                                                  \
-                                                                         \
-  return vec_offset (T, &dummy) + alloc_ * sizeof(T);                    \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,embedded_init)                              \
-     (VEC(T) *vec_, int alloc_)                                                  \
-{                                                                        \
-  vec_->num = 0;                                                         \
-  vec_->alloc = alloc_;                                                          \
-}                                                                        \
-                                                                         \
-static inline int VEC_OP (T,space)                                       \
-     (VEC(T) *vec_, int alloc_ VEC_ASSERT_DECL)                                  \
-{                                                                        \
-  vec_assert (alloc_ >= 0, "space");                                     \
-  return vec_ ? vec_->alloc - vec_->num >= (unsigned)alloc_ : !alloc_;   \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,quick_push)                                   \
-     (VEC(T) *vec_, const T *obj_ VEC_ASSERT_DECL)                       \
-{                                                                        \
-  T *slot_;                                                              \
-                                                                         \
-  vec_assert (vec_->num < vec_->alloc, "quick_push");                    \
-  slot_ = &vec_->vec[vec_->num++];                                       \
-  if (obj_)                                                              \
-    *slot_ = *obj_;                                                      \
-                                                                         \
-  return slot_;                                                                  \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,pop) (VEC(T) *vec_ VEC_ASSERT_DECL)         \
-{                                                                        \
-  vec_assert (vec_->num, "pop");                                         \
-  --vec_->num;                                                           \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,truncate)                                   \
-     (VEC(T) *vec_, unsigned size_ VEC_ASSERT_DECL)                      \
-{                                                                        \
-  vec_assert (vec_ ? vec_->num >= size_ : !size_, "truncate");           \
-  if (vec_)                                                              \
-    vec_->num = size_;                                                   \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,replace)                                      \
-     (VEC(T) *vec_, unsigned ix_, const T *obj_ VEC_ASSERT_DECL)         \
-{                                                                        \
-  T *slot_;                                                              \
-                                                                         \
-  vec_assert (ix_ < vec_->num, "replace");                               \
-  slot_ = &vec_->vec[ix_];                                               \
-  if (obj_)                                                              \
-    *slot_ = *obj_;                                                      \
-                                                                         \
-  return slot_;                                                                  \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,quick_insert)                                 \
-     (VEC(T) *vec_, unsigned ix_, const T *obj_ VEC_ASSERT_DECL)         \
-{                                                                        \
-  T *slot_;                                                              \
-                                                                         \
-  vec_assert (vec_->num < vec_->alloc && ix_ <= vec_->num, "quick_insert"); \
-  slot_ = &vec_->vec[ix_];                                               \
-  memmove (slot_ + 1, slot_, (vec_->num++ - ix_) * sizeof (T));                  \
-  if (obj_)                                                              \
-    *slot_ = *obj_;                                                      \
-                                                                         \
-  return slot_;                                                                  \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,ordered_remove)                             \
-     (VEC(T) *vec_, unsigned ix_ VEC_ASSERT_DECL)                        \
-{                                                                        \
-  T *slot_;                                                              \
-                                                                         \
-  vec_assert (ix_ < vec_->num, "ordered_remove");                        \
-  slot_ = &vec_->vec[ix_];                                               \
-  memmove (slot_, slot_ + 1, (--vec_->num - ix_) * sizeof (T));                  \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,unordered_remove)                           \
-     (VEC(T) *vec_, unsigned ix_ VEC_ASSERT_DECL)                        \
-{                                                                        \
-  vec_assert (ix_ < vec_->num, "unordered_remove");                      \
-  vec_->vec[ix_] = vec_->vec[--vec_->num];                               \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,block_remove)                               \
-     (VEC(T) *vec_, unsigned ix_, unsigned len_ VEC_ASSERT_DECL)         \
-{                                                                        \
-  T *slot_;                                                              \
-                                                                         \
-  vec_assert (ix_ + len_ <= vec_->num, "block_remove");                          \
-  slot_ = &vec_->vec[ix_];                                               \
-  vec_->num -= len_;                                                     \
-  memmove (slot_, slot_ + len_, (vec_->num - ix_) * sizeof (T));         \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,address)                                      \
-     (VEC(T) *vec_)                                                      \
-{                                                                        \
-  return vec_ ? vec_->vec : 0;                                           \
-}                                                                        \
-                                                                         \
-static inline unsigned VEC_OP (T,lower_bound)                            \
-     (VEC(T) *vec_, const T *obj_,                                       \
-      int (*lessthan_)(const T *, const T *) VEC_ASSERT_DECL)            \
-{                                                                        \
-   unsigned int len_ = VEC_OP (T, length) (vec_);                        \
-   unsigned int half_, middle_;                                                  \
-   unsigned int first_ = 0;                                              \
-   while (len_ > 0)                                                      \
-     {                                                                   \
-        T *middle_elem_;                                                 \
-        half_ = len_ >> 1;                                               \
-        middle_ = first_;                                                \
-        middle_ += half_;                                                \
-        middle_elem_ = VEC_OP (T,index) (vec_, middle_ VEC_ASSERT_PASS);  \
-        if (lessthan_ (middle_elem_, obj_))                              \
-          {                                                              \
-             first_ = middle_;                                           \
-             ++first_;                                                   \
-             len_ = len_ - half_ - 1;                                    \
-          }                                                              \
-        else                                                             \
-          len_ = half_;                                                          \
-     }                                                                   \
-   return first_;                                                        \
-}
-
-#define DEF_VEC_ALLOC_FUNC_O(T)                                                  \
-static inline VEC(T) *VEC_OP (T,alloc)                                   \
-     (int alloc_)                                                        \
-{                                                                        \
-  VEC(T) dummy;                                                                  \
-                                                                         \
-  /* We must request exact size allocation, hence the negation.  */      \
-  return (VEC(T) *) vec_o_reserve (NULL, -alloc_,                        \
-                                   vec_offset (T, &dummy), sizeof (T));          \
-}                                                                        \
-                                                                         \
-static inline VEC(T) *VEC_OP (T,copy) (VEC(T) *vec_)                     \
-{                                                                        \
-  size_t len_ = vec_ ? vec_->num : 0;                                    \
-  VEC (T) *new_vec_ = NULL;                                              \
-                                                                         \
-  if (len_)                                                              \
-    {                                                                    \
-      VEC(T) dummy;                                                      \
-                                                                         \
-      /* We must request exact size allocation, hence the negation.  */          \
-      new_vec_ = (VEC (T) *)                                             \
-       vec_o_reserve  (NULL, -len_, vec_offset (T, &dummy), sizeof (T)); \
-                                                                         \
-      new_vec_->num = len_;                                              \
-      memcpy (new_vec_->vec, vec_->vec, sizeof (T) * len_);              \
-    }                                                                    \
-  return new_vec_;                                                       \
-}                                                                        \
-                                                                         \
-static inline VEC(T) *VEC_OP (T,merge) (VEC(T) *vec1_, VEC(T) *vec2_)    \
-{                                                                        \
-  if (vec1_ && vec2_)                                                    \
-    {                                                                    \
-      VEC(T) dummy;                                                      \
-      size_t len_ = vec1_->num + vec2_->num;                             \
-      VEC (T) *new_vec_ = NULL;                                                  \
-                                                                         \
-      /* We must request exact size allocation, hence the negation.  */          \
-      new_vec_ = (VEC (T) *)                                             \
-       vec_o_reserve (NULL, -len_, vec_offset (T, &dummy), sizeof (T));  \
-                                                                         \
-      new_vec_->num = len_;                                              \
-      memcpy (new_vec_->vec, vec1_->vec, sizeof (T) * vec1_->num);       \
-      memcpy (new_vec_->vec + vec1_->num, vec2_->vec,                    \
-             sizeof (T) * vec2_->num);                                   \
-                                                                         \
-      return new_vec_;                                                   \
-    }                                                                    \
-  else                                                                   \
-    return VEC_copy (T, vec1_ ? vec1_ : vec2_);                                  \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,free)                                       \
-     (VEC(T) **vec_)                                                     \
-{                                                                        \
-  if (*vec_)                                                             \
-    vec_free_ (*vec_);                                                   \
-  *vec_ = NULL;                                                                  \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,cleanup)                                    \
-     (void *arg_)                                                        \
-{                                                                        \
-  VEC(T) **vec_ = (VEC(T) **) arg_;                                      \
-  if (*vec_)                                                             \
-    vec_free_ (*vec_);                                                   \
-  *vec_ = NULL;                                                                  \
-}                                                                        \
-                                                                         \
-static inline int VEC_OP (T,reserve)                                     \
-     (VEC(T) **vec_, int alloc_ VEC_ASSERT_DECL)                         \
-{                                                                        \
-  VEC(T) dummy;                                                                  \
-  int extend = !VEC_OP (T,space) (*vec_, alloc_ < 0 ? -alloc_ : alloc_   \
-                                 VEC_ASSERT_PASS);                       \
-                                                                         \
-  if (extend)                                                            \
-    *vec_ = (VEC(T) *)                                                   \
-      vec_o_reserve (*vec_, alloc_, vec_offset (T, &dummy), sizeof (T));  \
-                                                                         \
-  return extend;                                                         \
-}                                                                        \
-                                                                         \
-static inline void VEC_OP (T,safe_grow)                                          \
-     (VEC(T) **vec_, int size_ VEC_ASSERT_DECL)                                  \
-{                                                                        \
-  vec_assert (size_ >= 0 && VEC_OP(T,length) (*vec_) <= (unsigned)size_,  \
-       "safe_grow");                                                     \
-  VEC_OP (T,reserve)                                                     \
-       (vec_, (int)(*vec_ ? (*vec_)->num : 0) - size_ VEC_ASSERT_PASS);  \
-  (*vec_)->num = size_;                                                          \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,safe_push)                                    \
-     (VEC(T) **vec_, const T *obj_ VEC_ASSERT_DECL)                      \
-{                                                                        \
-  VEC_OP (T,reserve) (vec_, 1 VEC_ASSERT_PASS);                                  \
-                                                                         \
-  return VEC_OP (T,quick_push) (*vec_, obj_ VEC_ASSERT_PASS);            \
-}                                                                        \
-                                                                         \
-static inline T *VEC_OP (T,safe_insert)                                          \
-     (VEC(T) **vec_, unsigned ix_, const T *obj_ VEC_ASSERT_DECL)        \
-{                                                                        \
-  VEC_OP (T,reserve) (vec_, 1 VEC_ASSERT_PASS);                                  \
-                                                                         \
-  return VEC_OP (T,quick_insert) (*vec_, ix_, obj_ VEC_ASSERT_PASS);     \
-}
-
-#endif /* COMMON_VEC_H */
index 0daea9c2dac2a369d4fae11773708f00dadf20cd..370141e68885370af7099a1e329763eabbbf0d79 100644 (file)
@@ -27,7 +27,6 @@ struct symtab;
 #include "frame.h"
 #include "ui-out.h"
 #include "btrace.h"
-#include "gdbsupport/vec.h"
 #include "target/waitstatus.h"
 #include "cli/cli-utils.h"
 #include "gdbsupport/refcounted-object.h"
index b32ec4fad29310161814a8aeedd575e44850d8d4..953e17bf0e413b2a93d8fa078fe5ccd160e73c2c 100644 (file)
@@ -26,7 +26,6 @@
 #include "gdbtypes.h"
 #include "objfiles.h"
 #include "language.h"
-#include "gdbsupport/vec.h"
 #include "bcache.h"
 #include "dwarf2loc.h"
 #include "typeprint.h"
index b039ab8fa23c21ce80d819f538f88dfdcb35a108..5840e3ee3198e6869a0cfc508e56890d8cb5ba95 100644 (file)
@@ -27,7 +27,6 @@
 #include "gdbthread.h"
 #include "regcache.h"
 #include "symtab.h"
-#include "gdbsupport/vec.h"
 #include "frame.h"
 #include <algorithm>
 
index a015d297c38e3797c8a4d46893a473d34536a64a..db884b0790d354c7089a073e3f80304ab07f5bb1 100644 (file)
@@ -28,7 +28,6 @@
 #include "gdbcore.h"
 #include "mach-o.h"
 #include "aout/stab_gnu.h"
-#include "gdbsupport/vec.h"
 #include "psympriv.h"
 #include "complaints.h"
 #include "gdb_bfd.h"
index 0475780b29f837eb1588d92c1f4a39fc19d88537..7a961af481d0a172ee8bd982acd16a5659da7b48 100644 (file)
@@ -25,7 +25,6 @@
 #include "target-dcache.h"
 #include "value.h"
 #include "language.h"
-#include "gdbsupport/vec.h"
 #include "breakpoint.h"
 #include "cli/cli-utils.h"
 #include <algorithm>
index f2fd66461cec3005b18d340c5450dda5fb736c13..4f84e20cd73061809095c74de113731d153397a7 100644 (file)
@@ -20,8 +20,6 @@
 #ifndef MEMRANGE_H
 #define MEMRANGE_H
 
-#include "gdbsupport/vec.h"
-
 /* Defines a [START, START + LENGTH) memory range.  */
 
 struct mem_range
index 740d5b0d97c153c189c055470feb1ab7a84f348a..980b1ebfb899041cec53ce514aa3c8b5cce2221b 100644 (file)
@@ -19,7 +19,6 @@
 #ifndef NAMESPACE_H
 #define NAMESPACE_H
 
-#include "gdbsupport/vec.h"
 #include "gdbsupport/gdb_vecs.h"
 #include "gdb_obstack.h"
 
index 1d5c7457ee4d68ff69da97d69a844a6d4ed150bb..0520ae4d0ad8139ea846e9fb3d7d37fc942628f1 100644 (file)
@@ -23,7 +23,6 @@
 #define NAT_LINUX_BTRACE_H
 
 #include "gdbsupport/btrace-common.h"
-#include "gdbsupport/vec.h"
 #if HAVE_LINUX_PERF_EVENT_H
 #  include <linux/perf_event.h>
 #endif
index ea3b7dce43b0c8a33400864c5a96880574cd3716..4bd1a0b9b28e99ca0f424f8fa74e567bab8fbda6 100644 (file)
@@ -19,7 +19,6 @@
 
 #include "defs.h"
 #include "target.h"
-#include "gdbsupport/vec.h"
 #include "xml-support.h"
 #include "osdata.h"
 #include "ui-out.h"
index 64aa9b8b1e0c71340450a8cbe87ecd5c1ad900e9..b6c77534f699e5e9b0a3015a54c2843550811c9b 100644 (file)
@@ -23,7 +23,6 @@
 #if !defined (PARSER_DEFS_H)
 #define PARSER_DEFS_H 1
 
-#include "gdbsupport/vec.h"
 #include "expression.h"
 #include "symtab.h"
 
index 073da1fbc062dc4dc4923c4b5d2fd222085f0460..5a053b99d098249656be35677727d79b05686990 100644 (file)
@@ -22,7 +22,6 @@
 #define PROGSPACE_H
 
 #include "target.h"
-#include "gdbsupport/vec.h"
 #include "gdb_bfd.h"
 #include "gdbsupport/gdb_vecs.h"
 #include "registry.h"
index 134f76dafb049e11d7e4163c24b54a3d8c360983..a2fca97a327eee7d09e4a2afc642b17d7f6e1f78 100644 (file)
@@ -26,7 +26,6 @@
 #include "demangle.h"
 #include "objfiles.h"
 #include "language.h"
-#include "gdbsupport/vec.h"
 #include "typeprint.h"
 
 typedef struct pyty_type_object
index c923b365c48d1a178256ba793c5430c0ac508b66..65dfe70dc16d11ddb9c65bfca949119c929a0bc6 100644 (file)
@@ -38,7 +38,6 @@
 #include "infrun.h"
 #include "event-loop.h"
 #include "inf-loop.h"
-#include "gdbsupport/vec.h"
 #include "inferior.h"
 #include <algorithm>
 #include "gdbarch.h"
index 60ce2cde057f21e64d6c357e1f4c981bdc964814..a15e0de12fd2439e87123ed1d1677c5b1730d1ec 100644 (file)
@@ -40,7 +40,6 @@
 #include "parser-defs.h"
 #include "gdbsupport/selftest.h"
 #include "value.h"
-#include "gdbsupport/vec.h"
 #include "gdbarch.h"
 
 #define GDB_YY_REMAP_PREFIX rust
index 3fd180850c14cf0ae8fc151b94966772c4968a8d..2b473d606660087eaa96335e718e0aa5c8b2c56d 100644 (file)
@@ -23,7 +23,6 @@
 #include "symtab.h"
 #include "symfile.h"
 #include "target.h"
-#include "gdbsupport/vec.h"
 #include "solib-target.h"
 #include <vector>
 
index 700b657967d3d8471677881b7a278ef4ee2ac26f..ea206cbb80f3016db7e30e65db751892b7cd7415 100644 (file)
@@ -20,7 +20,6 @@
 #include "defs.h"
 #include "stap-probe.h"
 #include "probe.h"
-#include "gdbsupport/vec.h"
 #include "ui-out.h"
 #include "objfiles.h"
 #include "arch-utils.h"
index 6bd08d98eed1c6d74f844d59ef2417bf2485e754..f4368bbc05573f5348d49bb25191d0a232b9fa96 100644 (file)
@@ -26,7 +26,6 @@
 #include "reggroups.h"
 #include "target.h"
 #include "target-descriptions.h"
-#include "gdbsupport/vec.h"
 #include "xml-support.h"
 #include "xml-tdesc.h"
 #include "osabi.h"
index ce964babaace3bdd53c39ff4fb8dc8d7aa6893fe..4b84431aab783dc24f4c393e548cd2b81095e4d4 100644 (file)
@@ -19,7 +19,6 @@
    along with this program.  If not, see <http://www.gnu.org/licenses/>.  */
 
 #include "defs.h"
-#include "gdbsupport/vec.h"
 #include "target.h"
 #include "memory-map.h"
 
index 8dbd2d62dc4b727a0d743fb20c4c31125edbc179..91e8a837ab27e4dd056876c484c3814564d122f4 100644 (file)
@@ -74,7 +74,6 @@ struct inferior;
 #include "bfd.h"
 #include "symtab.h"
 #include "memattr.h"
-#include "gdbsupport/vec.h"
 #include "gdbsupport/gdb_signals.h"
 #include "btrace.h"
 #include "record.h"
index 827a1b0c0f05a8bd27b34953898180f0c0c4ba36..6265b2fa1722b883bc8e21ee15b603b5ec7315b4 100644 (file)
@@ -26,7 +26,6 @@
 #include "gdb_regex.h"
 
 #include "varobj.h"
-#include "gdbsupport/vec.h"
 #include "gdbthread.h"
 #include "inferior.h"
 #include "varobj-iter.h"
index 8f00d780d47a9b303a97ed3701700ebe172bb133..eb01da10e2d9b169f8b02612af9e2c0cebbcdc93 100644 (file)
@@ -19,7 +19,6 @@
 
 #include "symtab.h"
 #include "gdbtypes.h"
-#include "gdbsupport/vec.h"
 #include "value.h"
 
 /* Enumeration for the format types */
index 7ceb93854547034c6d70515495cef9398a46d334..5012767568f4643f36bbf1b76767d744381af7bf 100644 (file)
@@ -22,7 +22,6 @@
 #define XML_SUPPORT_H
 
 #include "gdb_obstack.h"
-#include "gdbsupport/vec.h"
 #include "gdbsupport/xml-utils.h"
 #include "gdbsupport/byte-vector.h"
 #include "gdbsupport/gdb_optional.h"