struct symtabs_and_lines -> std::vector<symtab_and_line>

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

diff --git a/gdb/probe.c b/gdb/probe.c
index c147810354ede3f384462478d41ef71a4fbb6f52..5b5e6f0febba641a61af68032afacd4e1dcc6aa5 100644 (file)
--- a/gdb/probe.c
+++ b/gdb/probe.c
@@ -36,6 +36,7 @@
 #include "location.h"
 #include <ctype.h>
 #include <algorithm>
+#include "common/gdb_optional.h"
 
 typedef struct bound_probe bound_probe_s;
 DEF_VEC_O (bound_probe_s);
@@ -51,7 +52,7 @@ parse_probes_in_pspace (const struct probe_ops *probe_ops,
                        const char *objfile_namestr,
                        const char *provider,
                        const char *name,
-                       struct symtabs_and_lines *result)
+                       std::vector<symtab_and_line> *result)
 {
   struct objfile *objfile;
 
@@ -74,8 +75,6 @@ parse_probes_in_pspace (const struct probe_ops *probe_ops,
 
       for (ix = 0; VEC_iterate (probe_p, probes, ix, probe); ix++)
        {
-         struct symtab_and_line *sal;
-
          if (probe_ops != &probe_ops_any && probe->pops != probe_ops)
            continue;
 
@@ -85,26 +84,25 @@ parse_probes_in_pspace (const struct probe_ops *probe_ops,
          if (strcmp (probe->name, name) != 0)
            continue;
 
-         ++result->nelts;
-         result->sals = XRESIZEVEC (struct symtab_and_line, result->sals,
-                                    result->nelts);
-         sal = &result->sals[result->nelts - 1];
+         symtab_and_line sal;
+
+         init_sal (&sal);
 
-         init_sal (sal);
+         sal.pc = get_probe_address (probe, objfile);
+         sal.explicit_pc = 1;
+         sal.section = find_pc_overlay (sal.pc);
+         sal.pspace = search_pspace;
+         sal.probe = probe;
+         sal.objfile = objfile;
 
-         sal->pc = get_probe_address (probe, objfile);
-         sal->explicit_pc = 1;
-         sal->section = find_pc_overlay (sal->pc);
-         sal->pspace = search_pspace;
-         sal->probe = probe;
-         sal->objfile = objfile;
+         result->push_back (std::move (sal));
        }
     }
 }
 
 /* See definition in probe.h.  */
 
-struct symtabs_and_lines
+std::vector<symtab_and_line>
 parse_probes (const struct event_location *location,
              struct program_space *search_pspace,
              struct linespec_result *canonical)
@@ -112,13 +110,9 @@ parse_probes (const struct event_location *location,
   char *arg_end, *arg;
   char *objfile_namestr = NULL, *provider = NULL, *name, *p;
   struct cleanup *cleanup;
-  struct symtabs_and_lines result;
   const struct probe_ops *probe_ops;
   const char *arg_start, *cs;
 
-  result.sals = NULL;
-  result.nelts = 0;
-
   gdb_assert (event_location_type (location) == PROBE_LOCATION);
   arg_start = get_probe_location (location);
 
@@ -174,6 +168,7 @@ parse_probes (const struct event_location *location,
   if (objfile_namestr && *objfile_namestr == '\0')
     error (_("invalid objfile name"));
 
+  std::vector<symtab_and_line> result;
   if (search_pspace != NULL)
     {
       parse_probes_in_pspace (probe_ops, search_pspace, objfile_namestr,
@@ -188,7 +183,7 @@ parse_probes (const struct event_location *location,
                                provider, name, &result);
     }
 
-  if (result.nelts == 0)
+  if (result.empty ())
     {
       throw_error (NOT_FOUND_ERROR,
                   _("No probe matching objfile=`%s', provider=`%s', name=`%s'"),
@@ -288,18 +283,17 @@ collect_probes (char *objname, char *provider, char *probe_name,
 {
   struct objfile *objfile;
   VEC (bound_probe_s) *result = NULL;
-  struct cleanup *cleanup, *cleanup_temps;
-  regex_t obj_pat, prov_pat, probe_pat;
+  struct cleanup *cleanup;
+  gdb::optional<compiled_regex> obj_pat, prov_pat, probe_pat;
 
   cleanup = make_cleanup (VEC_cleanup (bound_probe_s), &result);
 
-  cleanup_temps = make_cleanup (null_cleanup, NULL);
   if (provider != NULL)
-    compile_rx_or_error (&prov_pat, provider, _("Invalid provider regexp"));
+    prov_pat.emplace (provider, REG_NOSUB, _("Invalid provider regexp"));
   if (probe_name != NULL)
-    compile_rx_or_error (&probe_pat, probe_name, _("Invalid probe regexp"));
+    probe_pat.emplace (probe_name, REG_NOSUB, _("Invalid probe regexp"));
   if (objname != NULL)
-    compile_rx_or_error (&obj_pat, objname, _("Invalid object file regexp"));
+    obj_pat.emplace (objname, REG_NOSUB, _("Invalid object file regexp"));
 
   ALL_OBJFILES (objfile)
     {
@@ -312,7 +306,7 @@ collect_probes (char *objname, char *provider, char *probe_name,
 
       if (objname)
        {
-         if (regexec (&obj_pat, objfile_name (objfile), 0, NULL, 0) != 0)
+         if (obj_pat->exec (objfile_name (objfile), 0, NULL, 0) != 0)
            continue;
        }
 
@@ -326,11 +320,11 @@ collect_probes (char *objname, char *provider, char *probe_name,
            continue;
 
          if (provider
-             && regexec (&prov_pat, probe->provider, 0, NULL, 0) != 0)
+             && prov_pat->exec (probe->provider, 0, NULL, 0) != 0)
            continue;
 
          if (probe_name
-             && regexec (&probe_pat, probe->name, 0, NULL, 0) != 0)
+             && probe_pat->exec (probe->name, 0, NULL, 0) != 0)
            continue;
 
          bound.objfile = objfile;
@@ -339,7 +333,6 @@ collect_probes (char *objname, char *provider, char *probe_name,
        }
     }
 
-  do_cleanups (cleanup_temps);
   discard_cleanups (cleanup);
   return result;
 }
@@ -678,10 +671,9 @@ info_probes_for_ops (const char *arg, int from_tty,
 
   for (i = 0; VEC_iterate (bound_probe_s, probes, i, probe); ++i)
     {
-      struct cleanup *inner;
       const char *probe_type = probe->probe->pops->type_name (probe->probe);
 
-      inner = make_cleanup_ui_out_tuple_begin_end (current_uiout, "probe");
+      ui_out_emit_tuple tuple_emitter (current_uiout, "probe");
 
       current_uiout->field_string ("type",probe_type);
       current_uiout->field_string ("provider", probe->probe->provider);
@@ -708,8 +700,6 @@ info_probes_for_ops (const char *arg, int from_tty,
       current_uiout->field_string ("object",
                           objfile_name (probe->objfile));
       current_uiout->text ("\n");
-
-      do_cleanups (inner);
     }
 
   any_found = !VEC_empty (bound_probe_s, probes);