X-Git-Url: http://git.efficios.com/?a=blobdiff_plain;f=gdb%2Flocation.c;h=faa37525619c3830ea8641ccffc9be79c0ff0a8b;hb=refs%2Fheads%2Fconcurrent-displaced-stepping-2020-04-01;hp=071d262d9f934a3a09f39f5c4e6cd465a538b8b0;hpb=870f88f7551b0f2d6aaaa36fb684b5ff8f468107;p=deliverable%2Fbinutils-gdb.git
diff --git a/gdb/location.c b/gdb/location.c
index 071d262d9f..faa3752561 100644
--- a/gdb/location.c
+++ b/gdb/location.c
@@ -1,5 +1,5 @@
/* Data structures and API for event locations in GDB.
- Copyright (C) 2013-2016 Free Software Foundation, Inc.
+ Copyright (C) 2013-2020 Free Software Foundation, Inc.
This file is part of GDB.
@@ -17,13 +17,14 @@
along with this program. If not, see . */
#include "defs.h"
-#include "gdb_assert.h"
+#include "gdbsupport/gdb_assert.h"
#include "location.h"
#include "symtab.h"
#include "language.h"
#include "linespec.h"
#include "cli/cli-utils.h"
#include "probe.h"
+#include "cp-support.h"
#include
#include
@@ -40,13 +41,14 @@ struct event_location
union
{
- /* A generic "this is a string specification" for a location.
- This representation is used by both "normal" linespecs and
- probes. */
+ /* A probe. */
char *addr_string;
-#define EL_LINESPEC(P) ((P)->u.addr_string)
#define EL_PROBE(P) ((P)->u.addr_string)
+ /* A "normal" linespec. */
+ struct linespec_location linespec_location;
+#define EL_LINESPEC(P) (&(P)->u.linespec_location)
+
/* An address in the inferior. */
CORE_ADDR address;
#define EL_ADDRESS(P) (P)->u.address
@@ -77,33 +79,36 @@ initialize_explicit_location (struct explicit_location *explicit_loc)
{
memset (explicit_loc, 0, sizeof (struct explicit_location));
explicit_loc->line_offset.sign = LINE_OFFSET_UNKNOWN;
+ explicit_loc->func_name_match_type = symbol_name_match_type::WILD;
}
/* See description in location.h. */
-struct event_location *
-new_linespec_location (char **linespec)
+event_location_up
+new_linespec_location (const char **linespec,
+ symbol_name_match_type match_type)
{
struct event_location *location;
location = XCNEW (struct event_location);
EL_TYPE (location) = LINESPEC_LOCATION;
+ EL_LINESPEC (location)->match_type = match_type;
if (*linespec != NULL)
{
- char *p;
- char *orig = *linespec;
+ const char *p;
+ const char *orig = *linespec;
linespec_lex_to_end (linespec);
p = remove_trailing_whitespace (orig, *linespec);
if ((p - orig) > 0)
- EL_LINESPEC (location) = savestring (orig, p - orig);
+ EL_LINESPEC (location)->spec_string = savestring (orig, p - orig);
}
- return location;
+ return event_location_up (location);
}
/* See description in location.h. */
-const char *
+const linespec_location *
get_linespec_location (const struct event_location *location)
{
gdb_assert (EL_TYPE (location) == LINESPEC_LOCATION);
@@ -112,7 +117,7 @@ get_linespec_location (const struct event_location *location)
/* See description in location.h. */
-struct event_location *
+event_location_up
new_address_location (CORE_ADDR addr, const char *addr_string,
int addr_string_len)
{
@@ -123,7 +128,7 @@ new_address_location (CORE_ADDR addr, const char *addr_string,
EL_ADDRESS (location) = addr;
if (addr_string != NULL)
EL_STRING (location) = xstrndup (addr_string, addr_string_len);
- return location;
+ return event_location_up (location);
}
/* See description in location.h. */
@@ -146,7 +151,7 @@ get_address_string_location (const struct event_location *location)
/* See description in location.h. */
-struct event_location *
+event_location_up
new_probe_location (const char *probe)
{
struct event_location *location;
@@ -155,7 +160,7 @@ new_probe_location (const char *probe)
EL_TYPE (location) = PROBE_LOCATION;
if (probe != NULL)
EL_PROBE (location) = xstrdup (probe);
- return location;
+ return event_location_up (location);
}
/* See description in location.h. */
@@ -169,7 +174,7 @@ get_probe_location (const struct event_location *location)
/* See description in location.h. */
-struct event_location *
+event_location_up
new_explicit_location (const struct explicit_location *explicit_loc)
{
struct event_location tmp;
@@ -179,6 +184,9 @@ new_explicit_location (const struct explicit_location *explicit_loc)
initialize_explicit_location (EL_EXPLICIT (&tmp));
if (explicit_loc != NULL)
{
+ EL_EXPLICIT (&tmp)->func_name_match_type
+ = explicit_loc->func_name_match_type;
+
if (explicit_loc->source_filename != NULL)
{
EL_EXPLICIT (&tmp)->source_filename
@@ -227,59 +235,54 @@ static char *
explicit_to_string_internal (int as_linespec,
const struct explicit_location *explicit_loc)
{
- struct ui_file *buf;
- char space, *result;
int need_space = 0;
- struct cleanup *cleanup;
-
- space = as_linespec ? ':' : ' ';
- buf = mem_fileopen ();
- cleanup = make_cleanup_ui_file_delete (buf);
+ char space = as_linespec ? ':' : ' ';
+ string_file buf;
if (explicit_loc->source_filename != NULL)
{
if (!as_linespec)
- fputs_unfiltered ("-source ", buf);
- fputs_unfiltered (explicit_loc->source_filename, buf);
+ buf.puts ("-source ");
+ buf.puts (explicit_loc->source_filename);
need_space = 1;
}
if (explicit_loc->function_name != NULL)
{
if (need_space)
- fputc_unfiltered (space, buf);
+ buf.putc (space);
+ if (explicit_loc->func_name_match_type == symbol_name_match_type::FULL)
+ buf.puts ("-qualified ");
if (!as_linespec)
- fputs_unfiltered ("-function ", buf);
- fputs_unfiltered (explicit_loc->function_name, buf);
+ buf.puts ("-function ");
+ buf.puts (explicit_loc->function_name);
need_space = 1;
}
if (explicit_loc->label_name != NULL)
{
if (need_space)
- fputc_unfiltered (space, buf);
+ buf.putc (space);
if (!as_linespec)
- fputs_unfiltered ("-label ", buf);
- fputs_unfiltered (explicit_loc->label_name, buf);
+ buf.puts ("-label ");
+ buf.puts (explicit_loc->label_name);
need_space = 1;
}
if (explicit_loc->line_offset.sign != LINE_OFFSET_UNKNOWN)
{
if (need_space)
- fputc_unfiltered (space, buf);
+ buf.putc (space);
if (!as_linespec)
- fputs_unfiltered ("-line ", buf);
- fprintf_filtered (buf, "%s%d",
- (explicit_loc->line_offset.sign == LINE_OFFSET_NONE ? ""
- : (explicit_loc->line_offset.sign
- == LINE_OFFSET_PLUS ? "+" : "-")),
- explicit_loc->line_offset.offset);
+ buf.puts ("-line ");
+ buf.printf ("%s%d",
+ (explicit_loc->line_offset.sign == LINE_OFFSET_NONE ? ""
+ : (explicit_loc->line_offset.sign
+ == LINE_OFFSET_PLUS ? "+" : "-")),
+ explicit_loc->line_offset.offset);
}
- result = ui_file_xstrdup (buf, NULL);
- do_cleanups (cleanup);
- return result;
+ return xstrdup (buf.c_str ());
}
/* See description in location.h. */
@@ -300,7 +303,7 @@ explicit_location_to_linespec (const struct explicit_location *explicit_loc)
/* See description in location.h. */
-struct event_location *
+event_location_up
copy_event_location (const struct event_location *src)
{
struct event_location *dst;
@@ -313,8 +316,10 @@ copy_event_location (const struct event_location *src)
switch (EL_TYPE (src))
{
case LINESPEC_LOCATION:
- if (EL_LINESPEC (src) != NULL)
- EL_LINESPEC (dst) = xstrdup (EL_LINESPEC (src));
+ EL_LINESPEC (dst)->match_type = EL_LINESPEC (src)->match_type;
+ if (EL_LINESPEC (src)->spec_string != NULL)
+ EL_LINESPEC (dst)->spec_string
+ = xstrdup (EL_LINESPEC (src)->spec_string);
break;
case ADDRESS_LOCATION:
@@ -322,6 +327,8 @@ copy_event_location (const struct event_location *src)
break;
case EXPLICIT_LOCATION:
+ EL_EXPLICIT (dst)->func_name_match_type
+ = EL_EXPLICIT (src)->func_name_match_type;
if (EL_EXPLICIT (src)->source_filename != NULL)
EL_EXPLICIT (dst)->source_filename
= xstrdup (EL_EXPLICIT (src)->source_filename);
@@ -346,31 +353,11 @@ copy_event_location (const struct event_location *src)
gdb_assert_not_reached ("unknown event location type");
}
- return dst;
-}
-
-/* A cleanup function for struct event_location. */
-
-static void
-delete_event_location_cleanup (void *data)
-{
- struct event_location *location = (struct event_location *) data;
-
- delete_event_location (location);
-}
-
-/* See description in location.h. */
-
-struct cleanup *
-make_cleanup_delete_event_location (struct event_location *location)
-{
- return make_cleanup (delete_event_location_cleanup, location);
+ return event_location_up (dst);
}
-/* See description in location.h. */
-
void
-delete_event_location (struct event_location *location)
+event_location_deleter::operator() (event_location *location) const
{
if (location != NULL)
{
@@ -379,7 +366,7 @@ delete_event_location (struct event_location *location)
switch (EL_TYPE (location))
{
case LINESPEC_LOCATION:
- xfree (EL_LINESPEC (location));
+ xfree (EL_LINESPEC (location)->spec_string);
break;
case ADDRESS_LOCATION:
@@ -414,8 +401,17 @@ event_location_to_string (struct event_location *location)
switch (EL_TYPE (location))
{
case LINESPEC_LOCATION:
- if (EL_LINESPEC (location) != NULL)
- EL_STRING (location) = xstrdup (EL_LINESPEC (location));
+ if (EL_LINESPEC (location)->spec_string != NULL)
+ {
+ linespec_location *ls = EL_LINESPEC (location);
+ if (ls->match_type == symbol_name_match_type::FULL)
+ {
+ EL_STRING (location)
+ = concat ("-qualified ", ls->spec_string, (char *) NULL);
+ }
+ else
+ EL_STRING (location) = xstrdup (ls->spec_string);
+ }
break;
case ADDRESS_LOCATION:
@@ -441,13 +437,44 @@ event_location_to_string (struct event_location *location)
return EL_STRING (location);
}
+/* Find an instance of the quote character C in the string S that is
+ outside of all single- and double-quoted strings (i.e., any quoting
+ other than C). */
+
+static const char *
+find_end_quote (const char *s, char end_quote_char)
+{
+ /* zero if we're not in quotes;
+ '"' if we're in a double-quoted string;
+ '\'' if we're in a single-quoted string. */
+ char nested_quote_char = '\0';
+
+ for (const char *scan = s; *scan != '\0'; scan++)
+ {
+ if (nested_quote_char != '\0')
+ {
+ if (*scan == nested_quote_char)
+ nested_quote_char = '\0';
+ else if (scan[0] == '\\' && *(scan + 1) != '\0')
+ scan++;
+ }
+ else if (*scan == end_quote_char && nested_quote_char == '\0')
+ return scan;
+ else if (*scan == '"' || *scan == '\'')
+ nested_quote_char = *scan;
+ }
+
+ return 0;
+}
+
/* A lexer for explicit locations. This function will advance INP
past any strings that it lexes. Returns a malloc'd copy of the
lexed string or NULL if no lexing was done. */
-static char *
+static gdb::unique_xmalloc_ptr
explicit_location_lex_one (const char **inp,
- const struct language_defn *language)
+ const struct language_defn *language,
+ explicit_completion_info *completion_info)
{
const char *start = *inp;
@@ -457,20 +484,27 @@ explicit_location_lex_one (const char **inp,
/* If quoted, skip to the ending quote. */
if (strchr (get_gdb_linespec_parser_quote_characters (), *start))
{
- char quote_char = *start;
+ if (completion_info != NULL)
+ completion_info->quoted_arg_start = start;
- /* If the input is not an Ada operator, skip to the matching
- closing quote and return the string. */
- if (!(language->la_language == language_ada
- && quote_char == '\"' && is_ada_operator (start)))
- {
- const char *end = find_toplevel_char (start + 1, quote_char);
+ const char *end = find_end_quote (start + 1, *start);
- if (end == NULL)
+ if (end == NULL)
+ {
+ if (completion_info == NULL)
error (_("Unmatched quote, %s."), start);
- *inp = end + 1;
- return savestring (start + 1, *inp - start - 2);
+
+ end = start + strlen (start);
+ *inp = end;
+ return gdb::unique_xmalloc_ptr (savestring (start + 1,
+ *inp - start - 1));
}
+
+ if (completion_info != NULL)
+ completion_info->quoted_arg_end = end;
+ *inp = end + 1;
+ return gdb::unique_xmalloc_ptr (savestring (start + 1,
+ *inp - start - 2));
}
/* If the input starts with '-' or '+', the string ends with the next
@@ -486,7 +520,8 @@ explicit_location_lex_one (const char **inp,
while (isdigit (*inp[0]))
++(*inp);
if (*inp[0] == '\0' || isspace (*inp[0]) || *inp[0] == ',')
- return savestring (start, *inp - start);
+ return gdb::unique_xmalloc_ptr (savestring (start,
+ *inp - start));
/* Otherwise stop at the next occurrence of whitespace, '\0',
keyword, or ','. */
@@ -498,50 +533,221 @@ explicit_location_lex_one (const char **inp,
{
/* Special case: C++ operator,. */
if (language->la_language == language_cplus
- && strncmp (*inp, "operator", 8)
- && (*inp)[9] == ',')
- (*inp) += 9;
+ && startswith (*inp, CP_OPERATOR_STR))
+ (*inp) += CP_OPERATOR_LEN;
++(*inp);
}
}
if (*inp - start > 0)
- return savestring (start, *inp - start);
+ return gdb::unique_xmalloc_ptr (savestring (start, *inp - start));
+
+ return NULL;
+}
+
+/* Return true if COMMA points past "operator". START is the start of
+ the line that COMMAND points to, hence when reading backwards, we
+ must not read any character before START. */
+
+static bool
+is_cp_operator (const char *start, const char *comma)
+{
+ if (comma != NULL
+ && (comma - start) >= CP_OPERATOR_LEN)
+ {
+ const char *p = comma;
+
+ while (p > start && isspace (p[-1]))
+ p--;
+ if (p - start >= CP_OPERATOR_LEN)
+ {
+ p -= CP_OPERATOR_LEN;
+ if (strncmp (p, CP_OPERATOR_STR, CP_OPERATOR_LEN) == 0
+ && (p == start
+ || !(isalnum (p[-1]) || p[-1] == '_')))
+ {
+ return true;
+ }
+ }
+ }
+ return false;
+}
+
+/* When scanning the input string looking for the next explicit
+ location option/delimiter, we jump to the next option by looking
+ for ",", and "-". Such a character can also appear in C++ symbols
+ like "operator," and "operator-". So when we find such a
+ character, we call this function to check if we found such a
+ symbol, meaning we had a false positive for an option string. In
+ that case, we keep looking for the next delimiter, until we find
+ one that is not a false positive, or we reach end of string. FOUND
+ is the character that scanning found (either '-' or ','), and START
+ is the start of the line that FOUND points to, hence when reading
+ backwards, we must not read any character before START. Returns a
+ pointer to the next non-false-positive delimiter character, or NULL
+ if none was found. */
+
+static const char *
+skip_op_false_positives (const char *start, const char *found)
+{
+ while (found != NULL && is_cp_operator (start, found))
+ {
+ if (found[0] == '-' && found[1] == '-')
+ start = found + 2;
+ else
+ start = found + 1;
+ found = find_toplevel_char (start, *found);
+ }
+
+ return found;
+}
+
+/* Assuming both FIRST and NEW_TOK point into the same string, return
+ the pointer that is closer to the start of the string. If FIRST is
+ NULL, returns NEW_TOK. If NEW_TOK is NULL, returns FIRST. */
+
+static const char *
+first_of (const char *first, const char *new_tok)
+{
+ if (first == NULL)
+ return new_tok;
+ else if (new_tok != NULL && new_tok < first)
+ return new_tok;
+ else
+ return first;
+}
+
+/* A lexer for functions in explicit locations. This function will
+ advance INP past a function until the next option, or until end of
+ string. Returns a malloc'd copy of the lexed string or NULL if no
+ lexing was done. */
+
+static gdb::unique_xmalloc_ptr
+explicit_location_lex_one_function (const char **inp,
+ const struct language_defn *language,
+ explicit_completion_info *completion_info)
+{
+ const char *start = *inp;
+
+ if (*start == '\0')
+ return NULL;
+
+ /* If quoted, skip to the ending quote. */
+ if (strchr (get_gdb_linespec_parser_quote_characters (), *start))
+ {
+ char quote_char = *start;
+
+ /* If the input is not an Ada operator, skip to the matching
+ closing quote and return the string. */
+ if (!(language->la_language == language_ada
+ && quote_char == '\"' && is_ada_operator (start)))
+ {
+ if (completion_info != NULL)
+ completion_info->quoted_arg_start = start;
+
+ const char *end = find_toplevel_char (start + 1, quote_char);
+
+ if (end == NULL)
+ {
+ if (completion_info == NULL)
+ error (_("Unmatched quote, %s."), start);
+
+ end = start + strlen (start);
+ *inp = end;
+ char *saved = savestring (start + 1, *inp - start - 1);
+ return gdb::unique_xmalloc_ptr (saved);
+ }
+
+ if (completion_info != NULL)
+ completion_info->quoted_arg_end = end;
+ *inp = end + 1;
+ char *saved = savestring (start + 1, *inp - start - 2);
+ return gdb::unique_xmalloc_ptr (saved);
+ }
+ }
+
+ const char *comma = find_toplevel_char (start, ',');
+
+ /* If we have "-function -myfunction", or perhaps better example,
+ "-function -[BasicClass doIt]" (objc selector), treat
+ "-myfunction" as the function name. I.e., skip the first char if
+ it is an hyphen. Don't skip the first char always, because we
+ may have C++ "operator<", and find_toplevel_char needs to see the
+ 'o' in that case. */
+ const char *hyphen
+ = (*start == '-'
+ ? find_toplevel_char (start + 1, '-')
+ : find_toplevel_char (start, '-'));
+
+ /* Check for C++ "operator," and "operator-". */
+ comma = skip_op_false_positives (start, comma);
+ hyphen = skip_op_false_positives (start, hyphen);
+
+ /* Pick the one that appears first. */
+ const char *end = first_of (hyphen, comma);
+
+ /* See if a linespec keyword appears first. */
+ const char *s = start;
+ const char *ws = find_toplevel_char (start, ' ');
+ while (ws != NULL && linespec_lexer_lex_keyword (ws + 1) == NULL)
+ {
+ s = ws + 1;
+ ws = find_toplevel_char (s, ' ');
+ }
+ if (ws != NULL)
+ end = first_of (end, ws + 1);
+
+ /* If we don't have any terminator, then take the whole string. */
+ if (end == NULL)
+ end = start + strlen (start);
+
+ /* Trim whitespace at the end. */
+ while (end > start && end[-1] == ' ')
+ end--;
+
+ *inp = end;
+
+ if (*inp - start > 0)
+ return gdb::unique_xmalloc_ptr (savestring (start, *inp - start));
return NULL;
}
/* See description in location.h. */
-struct event_location *
+event_location_up
string_to_explicit_location (const char **argp,
const struct language_defn *language,
- int dont_throw)
+ explicit_completion_info *completion_info)
{
- struct cleanup *cleanup;
- struct event_location *location;
+ event_location_up location;
/* It is assumed that input beginning with '-' and a non-digit
character is an explicit location. "-p" is reserved, though,
for probe locations. */
if (argp == NULL
- || *argp == '\0'
+ || *argp == NULL
|| *argp[0] != '-'
|| !isalpha ((*argp)[1])
|| ((*argp)[0] == '-' && (*argp)[1] == 'p'))
return NULL;
location = new_explicit_location (NULL);
- cleanup = make_cleanup_delete_event_location (location);
/* Process option/argument pairs. dprintf_command
requires that processing stop on ','. */
while ((*argp)[0] != '\0' && (*argp)[0] != ',')
{
int len;
- char *opt, *oarg;
const char *start;
- struct cleanup *opt_cleanup, *oarg_cleanup;
+
+ /* Clear these on each iteration, since they should be filled
+ with info about the last option. */
+ if (completion_info != NULL)
+ {
+ completion_info->quoted_arg_start = NULL;
+ completion_info->quoted_arg_end = NULL;
+ }
/* If *ARGP starts with a keyword, stop processing
options. */
@@ -551,45 +757,85 @@ string_to_explicit_location (const char **argp,
/* Mark the start of the string in case we need to rewind. */
start = *argp;
+ if (completion_info != NULL)
+ completion_info->last_option = start;
+
/* Get the option string. */
- opt = explicit_location_lex_one (argp, language);
- opt_cleanup = make_cleanup (xfree, opt);
+ gdb::unique_xmalloc_ptr opt
+ = explicit_location_lex_one (argp, language, NULL);
- *argp = skip_spaces_const (*argp);
+ /* Use the length of the option to allow abbreviations. */
+ len = strlen (opt.get ());
/* Get the argument string. */
- oarg = explicit_location_lex_one (argp, language);
- oarg_cleanup = make_cleanup (xfree, oarg);
- *argp = skip_spaces_const (*argp);
+ *argp = skip_spaces (*argp);
+
+ /* All options have a required argument. Checking for this
+ required argument is deferred until later. */
+ gdb::unique_xmalloc_ptr oarg;
+ /* True if we have an argument. This is required because we'll
+ move from OARG before checking whether we have an
+ argument. */
+ bool have_oarg = false;
+
+ /* True if the option needs an argument. */
+ bool need_oarg = false;
+
+ /* Convenience to consistently set both OARG/HAVE_OARG from
+ ARG. */
+ auto set_oarg = [&] (gdb::unique_xmalloc_ptr arg)
+ {
+ if (completion_info != NULL)
+ {
+ /* We do this here because the set of options that take
+ arguments matches the set of explicit location
+ options. */
+ completion_info->saw_explicit_location_option = true;
+ }
+ oarg = std::move (arg);
+ have_oarg = oarg != NULL;
+ need_oarg = true;
+ };
- /* Use the length of the option to allow abbreviations. */
- len = strlen (opt);
-
- /* All options have a required argument. Checking for this required
- argument is deferred until later. */
- if (strncmp (opt, "-source", len) == 0)
- EL_EXPLICIT (location)->source_filename = oarg;
- else if (strncmp (opt, "-function", len) == 0)
- EL_EXPLICIT (location)->function_name = oarg;
- else if (strncmp (opt, "-line", len) == 0)
+ if (strncmp (opt.get (), "-source", len) == 0)
+ {
+ set_oarg (explicit_location_lex_one (argp, language,
+ completion_info));
+ EL_EXPLICIT (location)->source_filename = oarg.release ();
+ }
+ else if (strncmp (opt.get (), "-function", len) == 0)
{
- if (oarg != NULL)
+ set_oarg (explicit_location_lex_one_function (argp, language,
+ completion_info));
+ EL_EXPLICIT (location)->function_name = oarg.release ();
+ }
+ else if (strncmp (opt.get (), "-qualified", len) == 0)
+ {
+ EL_EXPLICIT (location)->func_name_match_type
+ = symbol_name_match_type::FULL;
+ }
+ else if (strncmp (opt.get (), "-line", len) == 0)
+ {
+ set_oarg (explicit_location_lex_one (argp, language, NULL));
+ *argp = skip_spaces (*argp);
+ if (have_oarg)
{
EL_EXPLICIT (location)->line_offset
- = linespec_parse_line_offset (oarg);
- do_cleanups (oarg_cleanup);
- do_cleanups (opt_cleanup);
+ = linespec_parse_line_offset (oarg.get ());
continue;
}
}
- else if (strncmp (opt, "-label", len) == 0)
- EL_EXPLICIT (location)->label_name = oarg;
+ else if (strncmp (opt.get (), "-label", len) == 0)
+ {
+ set_oarg (explicit_location_lex_one (argp, language, completion_info));
+ EL_EXPLICIT (location)->label_name = oarg.release ();
+ }
/* Only emit an "invalid argument" error for options
that look like option strings. */
- else if (opt[0] == '-' && !isdigit (opt[1]))
+ else if (opt.get ()[0] == '-' && !isdigit (opt.get ()[1]))
{
- if (!dont_throw)
- error (_("invalid explicit location argument, \"%s\""), opt);
+ if (completion_info == NULL)
+ error (_("invalid explicit location argument, \"%s\""), opt.get ());
}
else
{
@@ -597,24 +843,17 @@ string_to_explicit_location (const char **argp,
Stop parsing and return whatever explicit location was
parsed. */
*argp = start;
- discard_cleanups (oarg_cleanup);
- do_cleanups (opt_cleanup);
- discard_cleanups (cleanup);
- return location;
+ break;
}
+ *argp = skip_spaces (*argp);
+
/* It's a little lame to error after the fact, but in this
case, it provides a much better user experience to issue
the "invalid argument" error before any missing
argument error. */
- if (oarg == NULL && !dont_throw)
- error (_("missing argument for \"%s\""), opt);
-
- /* The option/argument pair was successfully processed;
- oarg belongs to the explicit location, and opt should
- be freed. */
- discard_cleanups (oarg_cleanup);
- do_cleanups (opt_cleanup);
+ if (need_oarg && !have_oarg && completion_info == NULL)
+ error (_("missing argument for \"%s\""), opt.get ());
}
/* One special error check: If a source filename was given
@@ -623,28 +862,28 @@ string_to_explicit_location (const char **argp,
&& EL_EXPLICIT (location)->function_name == NULL
&& EL_EXPLICIT (location)->label_name == NULL
&& (EL_EXPLICIT (location)->line_offset.sign == LINE_OFFSET_UNKNOWN)
- && !dont_throw)
+ && completion_info == NULL)
{
error (_("Source filename requires function, label, or "
"line offset."));
}
- discard_cleanups (cleanup);
return location;
}
/* See description in location.h. */
-struct event_location *
-string_to_event_location_basic (char **stringp,
- const struct language_defn *language)
+event_location_up
+string_to_event_location_basic (const char **stringp,
+ const struct language_defn *language,
+ symbol_name_match_type match_type)
{
- struct event_location *location;
+ event_location_up location;
const char *cs;
/* Try the input as a probe spec. */
cs = *stringp;
- if (cs != NULL && probe_linespec_to_ops (&cs) != NULL)
+ if (cs != NULL && probe_linespec_to_static_ops (&cs) != NULL)
{
location = new_probe_location (*stringp);
*stringp += strlen (*stringp);
@@ -665,7 +904,7 @@ string_to_event_location_basic (char **stringp,
else
{
/* Everything else is a linespec. */
- location = new_linespec_location (stringp);
+ location = new_linespec_location (stringp, match_type);
}
}
@@ -674,30 +913,36 @@ string_to_event_location_basic (char **stringp,
/* See description in location.h. */
-struct event_location *
-string_to_event_location (char **stringp,
- const struct language_defn *language)
+event_location_up
+string_to_event_location (const char **stringp,
+ const struct language_defn *language,
+ symbol_name_match_type match_type)
{
- struct event_location *location;
const char *arg, *orig;
/* Try an explicit location. */
orig = arg = *stringp;
- location = string_to_explicit_location (&arg, language, 0);
+ event_location_up location = string_to_explicit_location (&arg, language, NULL);
if (location != NULL)
{
/* It was a valid explicit location. Advance STRINGP to
the end of input. */
*stringp += arg - orig;
- }
- else
- {
- /* Everything else is a "basic" linespec, address, or probe
- location. */
- location = string_to_event_location_basic (stringp, language);
+
+ /* If the user really specified a location, then we're done. */
+ if (!event_location_empty_p (location.get ()))
+ return location;
+
+ /* Otherwise, the user _only_ specified optional flags like
+ "-qualified", otherwise string_to_explicit_location would
+ have thrown an error. Save the flags for "basic" linespec
+ parsing below and discard the explicit location. */
+ match_type = EL_EXPLICIT (location)->func_name_match_type;
}
- return location;
+ /* Everything else is a "basic" linespec, address, or probe
+ location. */
+ return string_to_event_location_basic (stringp, language, match_type);
}
/* See description in location.h. */