Use XOBNEW/XOBNEWVEC/OBSTACK_ZALLOC when possible

[binutils-gdb.git] / gdb / ada-lang.c

diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c
index ff9dff50d72942232b34ed3ee62b5e210d86f76e..f2514b1239589d9913c619540260a823c6eb19cc 100644 (file)
--- a/gdb/ada-lang.c
+++ b/gdb/ada-lang.c
@@ -48,7 +48,7 @@
 #include "annotate.h"
 #include "valprint.h"
 #include "source.h"
 #include "annotate.h"
 #include "valprint.h"
 #include "source.h"

-#include "observer.h"
+#include "observable.h"

 #include "vec.h"
 #include "stack.h"
 #include "gdb_vecs.h"
 #include "vec.h"
 #include "stack.h"
 #include "gdb_vecs.h"


@@ -913,7 +913,7 @@ char *
 ada_main_name (void)
 {
   struct bound_minimal_symbol msym;
 ada_main_name (void)
 {
   struct bound_minimal_symbol msym;

-  static char *main_program_name = NULL;
+  static gdb::unique_xmalloc_ptr<char> main_program_name;

 
   /* For Ada, the name of the main procedure is stored in a specific
      string constant, generated by the binder.  Look for that symbol,
 
   /* For Ada, the name of the main procedure is stored in a specific
      string constant, generated by the binder.  Look for that symbol,


@@ -931,13 +931,12 @@ ada_main_name (void)
       if (main_program_name_addr == 0)
         error (_("Invalid address for Ada main program name."));
 
       if (main_program_name_addr == 0)
         error (_("Invalid address for Ada main program name."));
 

-      xfree (main_program_name);

       target_read_string (main_program_name_addr, &main_program_name,
                           1024, &err_code);
 
       if (err_code != 0)
         return NULL;
       target_read_string (main_program_name_addr, &main_program_name,
                           1024, &err_code);
 
       if (err_code != 0)
         return NULL;

-      return main_program_name;
+      return main_program_name.get ();

     }
 
   /* The main procedure doesn't seem to be in Ada.  */
     }
 
   /* The main procedure doesn't seem to be in Ada.  */


@@ -4745,8 +4744,7 @@ cache_symbol (const char *name, domain_enum domain, struct symbol *sym,
     return;
 
   h = msymbol_hash (name) % HASH_SIZE;
     return;
 
   h = msymbol_hash (name) % HASH_SIZE;

-  e = (struct cache_entry *) obstack_alloc (&sym_cache->cache_space,
-                                           sizeof (*e));
+  e = XOBNEW (&sym_cache->cache_space, cache_entry);

   e->next = sym_cache->root[h];
   sym_cache->root[h] = e;
   e->name = copy
   e->next = sym_cache->root[h];
   sym_cache->root[h] = e;
   e->name = copy


@@ -5181,9 +5179,9 @@ remove_extra_symbols (struct block_symbol *syms, int nsyms)
 /* Given a type that corresponds to a renaming entity, use the type name
    to extract the scope (package name or function name, fully qualified,
    and following the GNAT encoding convention) where this renaming has been
 /* Given a type that corresponds to a renaming entity, use the type name
    to extract the scope (package name or function name, fully qualified,
    and following the GNAT encoding convention) where this renaming has been

-   defined.  The string returned needs to be deallocated after use.  */
+   defined.  */

 
 

-static char *
+static std::string

 xget_renaming_scope (struct type *renaming_type)
 {
   /* The renaming types adhere to the following convention:
 xget_renaming_scope (struct type *renaming_type)
 {
   /* The renaming types adhere to the following convention:


@@ -5194,8 +5192,6 @@ xget_renaming_scope (struct type *renaming_type)
   const char *name = type_name_no_tag (renaming_type);
   const char *suffix = strstr (name, "___XR");
   const char *last;
   const char *name = type_name_no_tag (renaming_type);
   const char *suffix = strstr (name, "___XR");
   const char *last;

-  int scope_len;
-  char *scope;

 
   /* Now, backtrack a bit until we find the first "__".  Start looking
      at suffix - 3, as the <rename> part is at least one character long.  */
 
   /* Now, backtrack a bit until we find the first "__".  Start looking
      at suffix - 3, as the <rename> part is at least one character long.  */


@@ -5205,14 +5201,7 @@ xget_renaming_scope (struct type *renaming_type)
       break;
 
   /* Make a copy of scope and return it.  */
       break;
 
   /* Make a copy of scope and return it.  */

-
-  scope_len = last - name;
-  scope = (char *) xmalloc ((scope_len + 1) * sizeof (char));
-
-  strncpy (scope, name, scope_len);
-  scope[scope_len] = '\0';
-
-  return scope;
+  return std::string (name, last);

 }
 
 /* Return nonzero if NAME corresponds to a package name.  */
 }
 
 /* Return nonzero if NAME corresponds to a package name.  */


@@ -5252,21 +5241,14 @@ is_package_name (const char *name)
 static int
 old_renaming_is_invisible (const struct symbol *sym, const char *function_name)
 {
 static int
 old_renaming_is_invisible (const struct symbol *sym, const char *function_name)
 {

-  char *scope;
-  struct cleanup *old_chain;
-

   if (SYMBOL_CLASS (sym) != LOC_TYPEDEF)
     return 0;
 
   if (SYMBOL_CLASS (sym) != LOC_TYPEDEF)
     return 0;
 

-  scope = xget_renaming_scope (SYMBOL_TYPE (sym));
-  old_chain = make_cleanup (xfree, scope);
+  std::string scope = xget_renaming_scope (SYMBOL_TYPE (sym));

 
   /* If the rename has been defined in a package, then it is visible.  */
 
   /* If the rename has been defined in a package, then it is visible.  */

-  if (is_package_name (scope))
-    {
-      do_cleanups (old_chain);
-      return 0;
-    }
+  if (is_package_name (scope.c_str ()))
+    return 0;

 
   /* Check that the rename is in the current function scope by checking
      that its name starts with SCOPE.  */
 
   /* Check that the rename is in the current function scope by checking
      that its name starts with SCOPE.  */


@@ -5278,12 +5260,7 @@ old_renaming_is_invisible (const struct symbol *sym, const char *function_name)
   if (startswith (function_name, "_ada_"))
     function_name += 5;
 
   if (startswith (function_name, "_ada_"))
     function_name += 5;
 

-  {
-    int is_invisible = !startswith (function_name, scope);
-
-    do_cleanups (old_chain);
-    return is_invisible;
-  }
+  return !startswith (function_name, scope.c_str ());

 }
 
 /* Remove entries from SYMS that corresponds to a renaming entity that
 }
 
 /* Remove entries from SYMS that corresponds to a renaming entity that


@@ -12453,7 +12430,7 @@ ada_exception_name_addr (enum ada_exception_catchpoint_kind ex,
   return result;
 }
 
   return result;
 }
 

-static char *ada_exception_catchpoint_cond_string
+static std::string ada_exception_catchpoint_cond_string

   (const char *excep_string,
    enum ada_exception_catchpoint_kind ex);
 
   (const char *excep_string,
    enum ada_exception_catchpoint_kind ex);
 


@@ -12521,9 +12498,7 @@ static void
 create_excep_cond_exprs (struct ada_catchpoint *c,
                          enum ada_exception_catchpoint_kind ex)
 {
 create_excep_cond_exprs (struct ada_catchpoint *c,
                          enum ada_exception_catchpoint_kind ex)
 {

-  struct cleanup *old_chain;

   struct bp_location *bl;
   struct bp_location *bl;

-  char *cond_string;

 
   /* Nothing to do if there's no specific exception to catch.  */
   if (c->excep_string == NULL)
 
   /* Nothing to do if there's no specific exception to catch.  */
   if (c->excep_string == NULL)


@@ -12535,8 +12510,8 @@ create_excep_cond_exprs (struct ada_catchpoint *c,
 
   /* Compute the condition expression in text form, from the specific
      expection we want to catch.  */
 
   /* Compute the condition expression in text form, from the specific
      expection we want to catch.  */

-  cond_string = ada_exception_catchpoint_cond_string (c->excep_string, ex);
-  old_chain = make_cleanup (xfree, cond_string);
+  std::string cond_string
+    = ada_exception_catchpoint_cond_string (c->excep_string, ex);

 
   /* Iterate over all the catchpoint's locations, and parse an
      expression for each.  */
 
   /* Iterate over all the catchpoint's locations, and parse an
      expression for each.  */


@@ -12550,7 +12525,7 @@ create_excep_cond_exprs (struct ada_catchpoint *c,
        {
          const char *s;
 
        {
          const char *s;
 

-         s = cond_string;
+         s = cond_string.c_str ();

          TRY
            {
              exp = parse_exp_1 (&s, bl->address,
          TRY
            {
              exp = parse_exp_1 (&s, bl->address,


@@ -12568,8 +12543,6 @@ create_excep_cond_exprs (struct ada_catchpoint *c,
 
       ada_loc->excep_cond_expr = std::move (exp);
     }
 
       ada_loc->excep_cond_expr = std::move (exp);
     }

-
-  do_cleanups (old_chain);

 }
 
 /* ada_catchpoint destructor.  */
 }
 
 /* ada_catchpoint destructor.  */


@@ -12831,11 +12804,9 @@ print_mention_exception (enum ada_exception_catchpoint_kind ex,
       case ada_catch_exception:
         if (c->excep_string != NULL)
          {
       case ada_catch_exception:
         if (c->excep_string != NULL)
          {

-           char *info = xstrprintf (_("`%s' Ada exception"), c->excep_string);
-           struct cleanup *old_chain = make_cleanup (xfree, info);
-
-           uiout->text (info);
-           do_cleanups (old_chain);
+           std::string info = string_printf (_("`%s' Ada exception"),
+                                             c->excep_string);
+           uiout->text (info.c_str ());

          }
         else
           uiout->text (_("all Ada exceptions"));
          }
         else
           uiout->text (_("all Ada exceptions"));


@@ -13270,29 +13241,25 @@ ada_exception_breakpoint_ops (enum ada_exception_catchpoint_kind ex)
    being raised with the exception that the user wants to catch.  This
    assumes that this condition is used when the inferior just triggered
    an exception catchpoint.
    being raised with the exception that the user wants to catch.  This
    assumes that this condition is used when the inferior just triggered
    an exception catchpoint.

-   EX: the type of catchpoints used for catching Ada exceptions.
-   
-   The string returned is a newly allocated string that needs to be
-   deallocated later.  */
+   EX: the type of catchpoints used for catching Ada exceptions.  */

 
 

-static char *
+static std::string

 ada_exception_catchpoint_cond_string (const char *excep_string,
                                       enum ada_exception_catchpoint_kind ex)
 {
   int i;
   bool is_standard_exc = false;
 ada_exception_catchpoint_cond_string (const char *excep_string,
                                       enum ada_exception_catchpoint_kind ex)
 {
   int i;
   bool is_standard_exc = false;

-  const char *actual_exc_expr;
-  char *ref_exc_expr;
+  std::string result;

 
   if (ex == ada_catch_handlers)
     {
       /* For exception handlers catchpoints, the condition string does
          not use the same parameter as for the other exceptions.  */
 
   if (ex == ada_catch_handlers)
     {
       /* For exception handlers catchpoints, the condition string does
          not use the same parameter as for the other exceptions.  */

-      actual_exc_expr = ("long_integer (GNAT_GCC_exception_Access"
-                        "(gcc_exception).all.occurrence.id)");
+      result = ("long_integer (GNAT_GCC_exception_Access"
+               "(gcc_exception).all.occurrence.id)");

     }
   else
     }
   else

-    actual_exc_expr = "long_integer (e)";
+    result = "long_integer (e)";

 
   /* The standard exceptions are a special case.  They are defined in
      runtime units that have been compiled without debugging info; if
 
   /* The standard exceptions are a special case.  They are defined in
      runtime units that have been compiled without debugging info; if


@@ -13322,13 +13289,13 @@ ada_exception_catchpoint_cond_string (const char *excep_string,
        }
     }
 
        }
     }
 

+  result += " = ";
+

   if (is_standard_exc)
   if (is_standard_exc)

-    ref_exc_expr = xstrprintf ("long_integer (&standard.%s)", excep_string);
+    string_appendf (result, "long_integer (&standard.%s)", excep_string);

   else
   else

-    ref_exc_expr = xstrprintf ("long_integer (&%s)", excep_string);
+    string_appendf (result, "long_integer (&%s)", excep_string);

 
 

-  char *result =  xstrprintf ("%s = %s", actual_exc_expr, ref_exc_expr);
-  xfree (ref_exc_expr);

   return result;
 }
 
   return result;
 }
 


@@ -14518,6 +14485,7 @@ extern const struct language_defn ada_language_defn = {
   ada_read_var_value,          /* la_read_var_value */
   NULL,                         /* Language specific skip_trampoline */
   NULL,                         /* name_of_this */
   ada_read_var_value,          /* la_read_var_value */
   NULL,                         /* Language specific skip_trampoline */
   NULL,                         /* name_of_this */

+  true,                         /* la_store_sym_names_in_linkage_form_p */

   ada_lookup_symbol_nonlocal,   /* Looking up non-local symbols.  */
   basic_lookup_transparent_type,        /* lookup_transparent_type */
   ada_la_decode,                /* Language specific symbol demangler */
   ada_lookup_symbol_nonlocal,   /* Looking up non-local symbols.  */
   basic_lookup_transparent_type,        /* lookup_transparent_type */
   ada_la_decode,                /* Language specific symbol demangler */


@@ -14688,6 +14656,13 @@ With an argument, catch only exceptions with the given name."),
                     CATCH_TEMPORARY);
 
   varsize_limit = 65536;
                     CATCH_TEMPORARY);
 
   varsize_limit = 65536;

+  add_setshow_uinteger_cmd ("varsize-limit", class_support,
+                           &varsize_limit, _("\
+Set the maximum number of bytes allowed in a variable-size object."), _("\
+Show the maximum number of bytes allowed in a variable-size object."), _("\
+Attempts to access an object whose size is not a compile-time constant\n\
+and exceeds this limit will cause an error."),
+                           NULL, NULL, &setlist, &showlist);

 
   add_info ("exceptions", info_exceptions_command,
            _("\
 
   add_info ("exceptions", info_exceptions_command,
            _("\


@@ -14715,14 +14690,13 @@ When enabled, the debugger will stop using the DW_AT_GNAT_descriptive_type\n\
 DWARF attribute."),
      NULL, NULL, &maint_set_ada_cmdlist, &maint_show_ada_cmdlist);
 
 DWARF attribute."),
      NULL, NULL, &maint_set_ada_cmdlist, &maint_show_ada_cmdlist);
 

-  decoded_names_store = htab_create_alloc
-    (256, htab_hash_string, (int (*)(const void *, const void *)) streq,
-     NULL, xcalloc, xfree);
+  decoded_names_store = htab_create_alloc (256, htab_hash_string, streq_hash,
+                                          NULL, xcalloc, xfree);

 
   /* The ada-lang observers.  */
 
   /* The ada-lang observers.  */

-  observer_attach_new_objfile (ada_new_objfile_observer);
-  observer_attach_free_objfile (ada_free_objfile_observer);
-  observer_attach_inferior_exit (ada_inferior_exit);
+  gdb::observers::new_objfile.attach (ada_new_objfile_observer);
+  gdb::observers::free_objfile.attach (ada_free_objfile_observer);
+  gdb::observers::inferior_exit.attach (ada_inferior_exit);

 
   /* Setup various context-specific data.  */
   ada_inferior_data
 
   /* Setup various context-specific data.  */
   ada_inferior_data