Automatic date update in version.in

[deliverable/binutils-gdb.git] / gdb / parse.c

diff --git a/gdb/parse.c b/gdb/parse.c
index e3f1306a175abd20e926ca9a34ef43e0e8f32b35..c76e0d52c9048c92a0da5a72452bffbf7edca1b8 100644 (file)
--- a/gdb/parse.c
+++ b/gdb/parse.c
@@ -1,6 +1,6 @@
 /* Parse expressions for GDB.
 
 /* Parse expressions for GDB.
 

-   Copyright (C) 1986-2018 Free Software Foundation, Inc.
+   Copyright (C) 1986-2019 Free Software Foundation, Inc.

 
    Modified from expread.y by the Department of Computer Science at the
    State University of New York at Buffalo, 1991.
 
    Modified from expread.y by the Department of Computer Science at the
    State University of New York at Buffalo, 1991.


@@ -88,7 +88,7 @@ static int expout_last_struct = -1;
 static enum type_code expout_tag_completion_type = TYPE_CODE_UNDEF;
 
 /* The token for tagged type name completion.  */
 static enum type_code expout_tag_completion_type = TYPE_CODE_UNDEF;
 
 /* The token for tagged type name completion.  */

-static char *expout_completion_name;
+static gdb::unique_xmalloc_ptr<char> expout_completion_name;

 
 \f
 static unsigned int expressiondebug = 0;
 
 \f
 static unsigned int expressiondebug = 0;


@@ -116,10 +116,8 @@ static int prefixify_subexp (struct expression *, struct expression *, int,
 
 static expression_up parse_exp_in_context (const char **, CORE_ADDR,
                                           const struct block *, int,
 
 static expression_up parse_exp_in_context (const char **, CORE_ADDR,
                                           const struct block *, int,

-                                          int, int *);
-static expression_up parse_exp_in_context_1 (const char **, CORE_ADDR,
-                                            const struct block *, int,
-                                            int, int *);
+                                          int, int *,
+                                          innermost_block_tracker_types);

 
 /* Documented at it's declaration.  */
 
 
 /* Documented at it's declaration.  */
 


@@ -458,45 +456,37 @@ find_minsym_type_and_address (minimal_symbol *msymbol,
                              CORE_ADDR *address_p)
 {
   bound_minimal_symbol bound_msym = {msymbol, objfile};
                              CORE_ADDR *address_p)
 {
   bound_minimal_symbol bound_msym = {msymbol, objfile};

-  struct gdbarch *gdbarch = get_objfile_arch (objfile);

   struct obj_section *section = MSYMBOL_OBJ_SECTION (objfile, msymbol);
   enum minimal_symbol_type type = MSYMBOL_TYPE (msymbol);
   struct obj_section *section = MSYMBOL_OBJ_SECTION (objfile, msymbol);
   enum minimal_symbol_type type = MSYMBOL_TYPE (msymbol);

-  CORE_ADDR pc;

 
   bool is_tls = (section != NULL
                 && section->the_bfd_section->flags & SEC_THREAD_LOCAL);
 
 
   bool is_tls = (section != NULL
                 && section->the_bfd_section->flags & SEC_THREAD_LOCAL);
 

-  /* Addresses of TLS symbols are really offsets into a
-     per-objfile/per-thread storage block.  */
-  CORE_ADDR addr = (is_tls
-                   ? MSYMBOL_VALUE_RAW_ADDRESS (bound_msym.minsym)
-                   : BMSYMBOL_VALUE_ADDRESS (bound_msym));
-

   /* The minimal symbol might point to a function descriptor;
      resolve it to the actual code address instead.  */
   /* The minimal symbol might point to a function descriptor;
      resolve it to the actual code address instead.  */

-  pc = gdbarch_convert_from_func_ptr_addr (gdbarch, addr, &current_target);
-  if (pc != addr)
+  CORE_ADDR addr;
+  if (is_tls)

     {
     {

-      struct bound_minimal_symbol ifunc_msym = lookup_minimal_symbol_by_pc (pc);
-
-      /* In this case, assume we have a code symbol instead of
-        a data symbol.  */
-
-      if (ifunc_msym.minsym != NULL
-         && MSYMBOL_TYPE (ifunc_msym.minsym) == mst_text_gnu_ifunc
-         && BMSYMBOL_VALUE_ADDRESS (ifunc_msym) == pc)
+      /* Addresses of TLS symbols are really offsets into a
+        per-objfile/per-thread storage block.  */
+      addr = MSYMBOL_VALUE_RAW_ADDRESS (bound_msym.minsym);
+    }
+  else if (msymbol_is_function (objfile, msymbol, &addr))
+    {
+      if (addr != BMSYMBOL_VALUE_ADDRESS (bound_msym))

        {
        {

-         /* A function descriptor has been resolved but PC is still in the
-            STT_GNU_IFUNC resolver body (such as because inferior does not
-            run to be able to call it).  */
-
-         type = mst_text_gnu_ifunc;
+         /* This means we resolved a function descriptor, and we now
+            have an address for a code/text symbol instead of a data
+            symbol.  */
+         if (MSYMBOL_TYPE (msymbol) == mst_data_gnu_ifunc)
+           type = mst_text_gnu_ifunc;
+         else
+           type = mst_text;
+         section = NULL;

        }
        }

-      else
-       type = mst_text;
-      section = NULL;
-      addr = pc;

     }
     }

+  else
+    addr = BMSYMBOL_VALUE_ADDRESS (bound_msym);

 
   if (overlay_debugging)
     addr = symbol_overlayed_address (addr, section);
 
   if (overlay_debugging)
     addr = symbol_overlayed_address (addr, section);


@@ -575,9 +565,7 @@ mark_completion_tag (enum type_code tag, const char *ptr, int length)
              || tag == TYPE_CODE_STRUCT
              || tag == TYPE_CODE_ENUM);
   expout_tag_completion_type = tag;
              || tag == TYPE_CODE_STRUCT
              || tag == TYPE_CODE_ENUM);
   expout_tag_completion_type = tag;

-  expout_completion_name = (char *) xmalloc (length + 1);
-  memcpy (expout_completion_name, ptr, length);
-  expout_completion_name[length] = '\0';
+  expout_completion_name.reset (xstrndup (ptr, length));

 }
 
 \f
 }
 
 \f


@@ -802,6 +790,7 @@ copy_name (struct stoken token)
 int
 prefixify_expression (struct expression *expr)
 {
 int
 prefixify_expression (struct expression *expr)
 {

+  gdb_assert (expr->nelts > 0);

   int len = sizeof (struct expression) + EXP_ELEM_TO_BYTES (expr->nelts);
   struct expression *temp;
   int inpos = expr->nelts, outpos = 0;
   int len = sizeof (struct expression) + EXP_ELEM_TO_BYTES (expr->nelts);
   struct expression *temp;
   int inpos = expr->nelts, outpos = 0;


@@ -936,6 +925,7 @@ operator_length_standard (const struct expression *expr, int endpos,
     case UNOP_CHR:
     case UNOP_FLOAT:
     case UNOP_HIGH:
     case UNOP_CHR:
     case UNOP_FLOAT:
     case UNOP_HIGH:

+    case UNOP_KIND:

     case UNOP_ODD:
     case UNOP_ORD:
     case UNOP_TRUNC:
     case UNOP_ODD:
     case UNOP_ORD:
     case UNOP_TRUNC:


@@ -1004,6 +994,7 @@ operator_length_standard (const struct expression *expr, int endpos,
       switch (range_type)
        {
        case LOW_BOUND_DEFAULT:
       switch (range_type)
        {
        case LOW_BOUND_DEFAULT:

+       case LOW_BOUND_DEFAULT_EXCLUSIVE:

        case HIGH_BOUND_DEFAULT:
          args = 1;
          break;
        case HIGH_BOUND_DEFAULT:
          args = 1;
          break;


@@ -1011,6 +1002,7 @@ operator_length_standard (const struct expression *expr, int endpos,
          args = 0;
          break;
        case NONE_BOUND_DEFAULT:
          args = 0;
          break;
        case NONE_BOUND_DEFAULT:

+       case NONE_BOUND_DEFAULT_EXCLUSIVE:

          args = 2;
          break;
        }
          args = 2;
          break;
        }


@@ -1101,18 +1093,10 @@ prefixify_subexp (struct expression *inexpr,
 
 expression_up
 parse_exp_1 (const char **stringptr, CORE_ADDR pc, const struct block *block,
 
 expression_up
 parse_exp_1 (const char **stringptr, CORE_ADDR pc, const struct block *block,

-            int comma)
-{
-  return parse_exp_in_context (stringptr, pc, block, comma, 0, NULL);
-}
-
-static expression_up
-parse_exp_in_context (const char **stringptr, CORE_ADDR pc,
-                     const struct block *block,
-                     int comma, int void_context_p, int *out_subexp)
+            int comma, innermost_block_tracker_types tracker_types)

 {
 {

-  return parse_exp_in_context_1 (stringptr, pc, block, comma,
-                                void_context_p, out_subexp);
+  return parse_exp_in_context (stringptr, pc, block, comma, 0, NULL,
+                              tracker_types);

 }
 
 /* As for parse_exp_1, except that if VOID_CONTEXT_P, then
 }
 
 /* As for parse_exp_1, except that if VOID_CONTEXT_P, then


@@ -1123,9 +1107,10 @@ parse_exp_in_context (const char **stringptr, CORE_ADDR pc,
    is left untouched.  */
 
 static expression_up
    is left untouched.  */
 
 static expression_up

-parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc,
-                       const struct block *block,
-                       int comma, int void_context_p, int *out_subexp)
+parse_exp_in_context (const char **stringptr, CORE_ADDR pc,
+                     const struct block *block,
+                     int comma, int void_context_p, int *out_subexp,
+                     innermost_block_tracker_types tracker_types)

 {
   const struct language_defn *lang = NULL;
   int subexp;
 {
   const struct language_defn *lang = NULL;
   int subexp;


@@ -1134,11 +1119,11 @@ parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc,
   prev_lexptr = NULL;
 
   paren_depth = 0;
   prev_lexptr = NULL;
 
   paren_depth = 0;

-  type_stack.depth = 0;
+  type_stack.elements.clear ();

   expout_last_struct = -1;
   expout_tag_completion_type = TYPE_CODE_UNDEF;
   expout_last_struct = -1;
   expout_tag_completion_type = TYPE_CODE_UNDEF;

-  xfree (expout_completion_name);
-  expout_completion_name = NULL;
+  expout_completion_name.reset ();
+  innermost_block.reset (tracker_types);

 
   comma_terminates = comma;
 
 
   comma_terminates = comma;
 


@@ -1155,7 +1140,7 @@ parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc,
   if (!expression_context_block)
     expression_context_block = get_selected_block (&expression_context_pc);
   else if (pc == 0)
   if (!expression_context_block)
     expression_context_block = get_selected_block (&expression_context_pc);
   else if (pc == 0)

-    expression_context_pc = BLOCK_START (expression_context_block);
+    expression_context_pc = BLOCK_ENTRY_PC (expression_context_block);

   else
     expression_context_pc = pc;
 
   else
     expression_context_pc = pc;
 


@@ -1169,7 +1154,7 @@ parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc,
          = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (cursal.symtab),
                               STATIC_BLOCK);
       if (expression_context_block)
          = BLOCKVECTOR_BLOCK (SYMTAB_BLOCKVECTOR (cursal.symtab),
                               STATIC_BLOCK);
       if (expression_context_block)

-       expression_context_pc = BLOCK_START (expression_context_block);
+       expression_context_pc = BLOCK_ENTRY_PC (expression_context_block);

     }
 
   if (language_mode == language_mode_auto && block != NULL)
     }
 
   if (language_mode == language_mode_auto && block != NULL)


@@ -1210,12 +1195,14 @@ parse_exp_in_context_1 (const char **stringptr, CORE_ADDR pc,
 
   TRY
     {
 
   TRY
     {

-      if (lang->la_parser (&ps))
-        lang->la_error (NULL);
+      lang->la_parser (&ps);

     }
   CATCH (except, RETURN_MASK_ALL)
     {
     }
   CATCH (except, RETURN_MASK_ALL)
     {

-      if (! parse_completion)
+      /* If parsing for completion, allow this to succeed; but if no
+        expression elements have been written, then there's nothing
+        to do, so fail.  */
+      if (! parse_completion || ps.expout_ptr == 0)

        throw_exception (except);
     }
   END_CATCH
        throw_exception (except);
     }
   END_CATCH


@@ -1277,11 +1264,11 @@ parse_expression_with_language (const char *string, enum language lang)
    reference; furthermore, if the parsing ends in the field name,
    return the field name in *NAME.  If the parsing ends in the middle
    of a field reference, but the reference is somehow invalid, throw
    reference; furthermore, if the parsing ends in the field name,
    return the field name in *NAME.  If the parsing ends in the middle
    of a field reference, but the reference is somehow invalid, throw

-   an exception.  In all other cases, return NULL.  Returned non-NULL
-   *NAME must be freed by the caller.  */
+   an exception.  In all other cases, return NULL.  */

 
 struct type *
 
 struct type *

-parse_expression_for_completion (const char *string, char **name,
+parse_expression_for_completion (const char *string,
+                                gdb::unique_xmalloc_ptr<char> *name,

                                 enum type_code *code)
 {
   expression_up exp;
                                 enum type_code *code)
 {
   expression_up exp;


@@ -1291,7 +1278,8 @@ parse_expression_for_completion (const char *string, char **name,
   TRY
     {
       parse_completion = 1;
   TRY
     {
       parse_completion = 1;

-      exp = parse_exp_in_context (&string, 0, 0, 0, 0, &subexp);
+      exp = parse_exp_in_context (&string, 0, 0, 0, 0, &subexp,
+                                 INNERMOST_BLOCK_FOR_SYMBOLS);

     }
   CATCH (except, RETURN_MASK_ERROR)
     {
     }
   CATCH (except, RETURN_MASK_ERROR)
     {


@@ -1306,23 +1294,24 @@ parse_expression_for_completion (const char *string, char **name,
   if (expout_tag_completion_type != TYPE_CODE_UNDEF)
     {
       *code = expout_tag_completion_type;
   if (expout_tag_completion_type != TYPE_CODE_UNDEF)
     {
       *code = expout_tag_completion_type;

-      *name = expout_completion_name;
-      expout_completion_name = NULL;
+      *name = std::move (expout_completion_name);

       return NULL;
     }
 
   if (expout_last_struct == -1)
     return NULL;
 
       return NULL;
     }
 
   if (expout_last_struct == -1)
     return NULL;
 

-  *name = extract_field_op (exp.get (), &subexp);
-  if (!*name)
-    return NULL;
+  const char *fieldname = extract_field_op (exp.get (), &subexp);
+  if (fieldname == NULL)
+    {
+      name->reset ();
+      return NULL;
+    }

 
 

+  name->reset (xstrdup (fieldname));

   /* This might throw an exception.  If so, we want to let it
      propagate.  */
   val = evaluate_subexpression_type (exp.get (), subexp);
   /* This might throw an exception.  If so, we want to let it
      propagate.  */
   val = evaluate_subexpression_type (exp.get (), subexp);

-  /* (*NAME) is a part of the EXP memory block freed below.  */
-  *name = xstrdup (*name);

 
   return value_type (val);
 }
 
   return value_type (val);
 }


@@ -1351,29 +1340,6 @@ parse_float (const char *p, int len,
 /* Stuff for maintaining a stack of types.  Currently just used by C, but
    probably useful for any language which declares its types "backwards".  */
 
 /* Stuff for maintaining a stack of types.  Currently just used by C, but
    probably useful for any language which declares its types "backwards".  */
 

-/* Ensure that there are HOWMUCH open slots on the type stack STACK.  */
-
-static void
-type_stack_reserve (struct type_stack *stack, int howmuch)
-{
-  if (stack->depth + howmuch >= stack->size)
-    {
-      stack->size *= 2;
-      if (stack->size < howmuch)
-       stack->size = howmuch;
-      stack->elements = XRESIZEVEC (union type_stack_elt, stack->elements,
-                                   stack->size);
-    }
-}
-
-/* Ensure that there is a single open slot in the global type stack.  */
-
-static void
-check_type_stack_depth (void)
-{
-  type_stack_reserve (&type_stack, 1);
-}
-

 /* A helper function for insert_type and insert_type_address_space.
    This does work of expanding the type stack and inserting the new
    element, ELEMENT, into the stack at location SLOT.  */
 /* A helper function for insert_type and insert_type_address_space.
    This does work of expanding the type stack and inserting the new
    element, ELEMENT, into the stack at location SLOT.  */


@@ -1381,13 +1347,8 @@ check_type_stack_depth (void)
 static void
 insert_into_type_stack (int slot, union type_stack_elt element)
 {
 static void
 insert_into_type_stack (int slot, union type_stack_elt element)
 {

-  check_type_stack_depth ();
-
-  if (slot < type_stack.depth)
-    memmove (&type_stack.elements[slot + 1], &type_stack.elements[slot],
-            (type_stack.depth - slot) * sizeof (union type_stack_elt));
-  type_stack.elements[slot] = element;
-  ++type_stack.depth;
+  gdb_assert (slot <= type_stack.elements.size ());
+  type_stack.elements.insert (type_stack.elements.begin () + slot, element);

 }
 
 /* Insert a new type, TP, at the bottom of the type stack.  If TP is
 }
 
 /* Insert a new type, TP, at the bottom of the type stack.  If TP is


@@ -1409,7 +1370,7 @@ insert_type (enum type_pieces tp)
   /* If there is anything on the stack (we know it will be a
      tp_pointer), insert the qualifier above it.  Otherwise, simply
      push this on the top of the stack.  */
   /* If there is anything on the stack (we know it will be a
      tp_pointer), insert the qualifier above it.  Otherwise, simply
      push this on the top of the stack.  */

-  if (type_stack.depth && (tp == tp_const || tp == tp_volatile))
+  if (!type_stack.elements.empty () && (tp == tp_const || tp == tp_volatile))

     slot = 1;
   else
     slot = 0;
     slot = 1;
   else
     slot = 0;


@@ -1421,15 +1382,17 @@ insert_type (enum type_pieces tp)
 void
 push_type (enum type_pieces tp)
 {
 void
 push_type (enum type_pieces tp)
 {

-  check_type_stack_depth ();
-  type_stack.elements[type_stack.depth++].piece = tp;
+  type_stack_elt elt;
+  elt.piece = tp;
+  type_stack.elements.push_back (elt);

 }
 
 void
 push_type_int (int n)
 {
 }
 
 void
 push_type_int (int n)
 {

-  check_type_stack_depth ();
-  type_stack.elements[type_stack.depth++].int_val = n;
+  type_stack_elt elt;
+  elt.int_val = n;
+  type_stack.elements.push_back (elt);

 }
 
 /* Insert a tp_space_identifier and the corresponding address space
 }
 
 /* Insert a tp_space_identifier and the corresponding address space


@@ -1449,7 +1412,7 @@ insert_type_address_space (struct parser_state *pstate, char *string)
   /* If there is anything on the stack (we know it will be a
      tp_pointer), insert the address space qualifier above it.
      Otherwise, simply push this on the top of the stack.  */
   /* If there is anything on the stack (we know it will be a
      tp_pointer), insert the address space qualifier above it.
      Otherwise, simply push this on the top of the stack.  */

-  if (type_stack.depth)
+  if (!type_stack.elements.empty ())

     slot = 1;
   else
     slot = 0;
     slot = 1;
   else
     slot = 0;


@@ -1464,27 +1427,37 @@ insert_type_address_space (struct parser_state *pstate, char *string)
 enum type_pieces
 pop_type (void)
 {
 enum type_pieces
 pop_type (void)
 {

-  if (type_stack.depth)
-    return type_stack.elements[--type_stack.depth].piece;
+  if (!type_stack.elements.empty ())
+    {
+      type_stack_elt elt = type_stack.elements.back ();
+      type_stack.elements.pop_back ();
+      return elt.piece;
+    }

   return tp_end;
 }
 
 int
 pop_type_int (void)
 {
   return tp_end;
 }
 
 int
 pop_type_int (void)
 {

-  if (type_stack.depth)
-    return type_stack.elements[--type_stack.depth].int_val;
+  if (!type_stack.elements.empty ())
+    {
+      type_stack_elt elt = type_stack.elements.back ();
+      type_stack.elements.pop_back ();
+      return elt.int_val;
+    }

   /* "Can't happen".  */
   return 0;
 }
 
 /* Pop a type list element from the global type stack.  */
 
   /* "Can't happen".  */
   return 0;
 }
 
 /* Pop a type list element from the global type stack.  */
 

-static VEC (type_ptr) *
+static std::vector<struct type *> *

 pop_typelist (void)
 {
 pop_typelist (void)
 {

-  gdb_assert (type_stack.depth);
-  return type_stack.elements[--type_stack.depth].typelist_val;
+  gdb_assert (!type_stack.elements.empty ());
+  type_stack_elt elt = type_stack.elements.back ();
+  type_stack.elements.pop_back ();
+  return elt.typelist_val;

 }
 
 /* Pop a type_stack element from the global type stack.  */
 }
 
 /* Pop a type_stack element from the global type stack.  */


@@ -1492,8 +1465,10 @@ pop_typelist (void)
 static struct type_stack *
 pop_type_stack (void)
 {
 static struct type_stack *
 pop_type_stack (void)
 {

-  gdb_assert (type_stack.depth);
-  return type_stack.elements[--type_stack.depth].stack_val;
+  gdb_assert (!type_stack.elements.empty ());
+  type_stack_elt elt = type_stack.elements.back ();
+  type_stack.elements.pop_back ();
+  return elt.stack_val;

 }
 
 /* Append the elements of the type stack FROM to the type stack TO.
 }
 
 /* Append the elements of the type stack FROM to the type stack TO.


@@ -1502,12 +1477,8 @@ pop_type_stack (void)
 struct type_stack *
 append_type_stack (struct type_stack *to, struct type_stack *from)
 {
 struct type_stack *
 append_type_stack (struct type_stack *to, struct type_stack *from)
 {

-  type_stack_reserve (to, from->depth);
-
-  memcpy (&to->elements[to->depth], &from->elements[0],
-         from->depth * sizeof (union type_stack_elt));
-  to->depth += from->depth;
-
+  to->elements.insert (to->elements.end (), from->elements.begin (),
+                      from->elements.end ());

   return to;
 }
 
   return to;
 }
 


@@ -1516,48 +1487,34 @@ append_type_stack (struct type_stack *to, struct type_stack *from)
 void
 push_type_stack (struct type_stack *stack)
 {
 void
 push_type_stack (struct type_stack *stack)
 {

-  check_type_stack_depth ();
-  type_stack.elements[type_stack.depth++].stack_val = stack;
+  type_stack_elt elt;
+  elt.stack_val = stack;
+  type_stack.elements.push_back (elt);

   push_type (tp_type_stack);
 }
 
 /* Copy the global type stack into a newly allocated type stack and
    return it.  The global stack is cleared.  The returned type stack
   push_type (tp_type_stack);
 }
 
 /* Copy the global type stack into a newly allocated type stack and
    return it.  The global stack is cleared.  The returned type stack

-   must be freed with type_stack_cleanup.  */
+   must be freed with delete.  */

 
 struct type_stack *
 get_type_stack (void)
 {
 
 struct type_stack *
 get_type_stack (void)
 {

-  struct type_stack *result = XNEW (struct type_stack);
-
-  *result = type_stack;
-  type_stack.depth = 0;
-  type_stack.size = 0;
-  type_stack.elements = NULL;
-
+  struct type_stack *result = new struct type_stack (std::move (type_stack));
+  type_stack.elements.clear ();

   return result;
 }
 
   return result;
 }
 

-/* A cleanup function that destroys a single type stack.  */
-
-void
-type_stack_cleanup (void *arg)
-{
-  struct type_stack *stack = (struct type_stack *) arg;
-
-  xfree (stack->elements);
-  xfree (stack);
-}
-

 /* Push a function type with arguments onto the global type stack.
    LIST holds the argument types.  If the final item in LIST is NULL,
    then the function will be varargs.  */
 
 void
 /* Push a function type with arguments onto the global type stack.
    LIST holds the argument types.  If the final item in LIST is NULL,
    then the function will be varargs.  */
 
 void

-push_typelist (VEC (type_ptr) *list)
+push_typelist (std::vector<struct type *> *list)

 {
 {

-  check_type_stack_depth ();
-  type_stack.elements[type_stack.depth++].typelist_val = list;
+  type_stack_elt elt;
+  elt.typelist_val = list;
+  type_stack.elements.push_back (elt);

   push_type (tp_function_with_arguments);
 }
 
   push_type (tp_function_with_arguments);
 }
 


@@ -1682,14 +1639,12 @@ follow_types (struct type *follow_type)
 
       case tp_function_with_arguments:
        {
 
       case tp_function_with_arguments:
        {

-         VEC (type_ptr) *args = pop_typelist ();
+         std::vector<struct type *> *args = pop_typelist ();

 
          follow_type
            = lookup_function_type_with_arguments (follow_type,
 
          follow_type
            = lookup_function_type_with_arguments (follow_type,

-                                                  VEC_length (type_ptr, args),
-                                                  VEC_address (type_ptr,
-                                                               args));
-         VEC_free (type_ptr, args);
+                                                  args->size (),
+                                                  args->data ());

        }
        break;
 
        }
        break;
 


@@ -1702,7 +1657,7 @@ follow_types (struct type *follow_type)
 
          type_stack = *stack;
          follow_type = follow_types (follow_type);
 
          type_stack = *stack;
          follow_type = follow_types (follow_type);

-         gdb_assert (type_stack.depth == 0);
+         gdb_assert (type_stack.elements.empty ());

 
          type_stack = save;
        }
 
          type_stack = save;
        }


@@ -1770,10 +1725,10 @@ operator_check_standard (struct expression *exp, int pos,
 
        for (arg = 0; arg < nargs; arg++)
          {
 
        for (arg = 0; arg < nargs; arg++)
          {

-           struct type *type = elts[pos + 3 + arg].type;
-           struct objfile *objfile = TYPE_OBJFILE (type);
+           struct type *inst_type = elts[pos + 3 + arg].type;
+           struct objfile *inst_objfile = TYPE_OBJFILE (inst_type);

 
 

-           if (objfile && (*objfile_func) (objfile, data))
+           if (inst_objfile && (*objfile_func) (inst_objfile, data))

              return 1;
          }
       }
              return 1;
          }
       }


@@ -1887,10 +1842,6 @@ increase_expout_size (struct parser_state *ps, size_t lenelt)
 void
 _initialize_parse (void)
 {
 void
 _initialize_parse (void)
 {

-  type_stack.size = 0;
-  type_stack.depth = 0;
-  type_stack.elements = NULL;
-

   add_setshow_zuinteger_cmd ("expression", class_maintenance,
                             &expressiondebug,
                             _("Set expression debugging."),
   add_setshow_zuinteger_cmd ("expression", class_maintenance,
                             &expressiondebug,
                             _("Set expression debugging."),