diff options
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/linespec.c | 151 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 12 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/minsym-fallback-main.cc | 1 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/minsym-fallback.cc | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/minsym-fallback.exp | 4 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.cp/minsym-fallback.h | 1 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.java/jmisc.exp | 4 |
8 files changed, 86 insertions, 102 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index f46d1ed..5ac570e 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,15 @@ 2011-07-01 Jan Kratochvil <jan.kratochvil@redhat.com> + Stop on first linespec terminator instead of eating what we can. + * linespec.c (is_linespec_boundary): New function. + (name_end): Remove function. + (keep_name_info): New parameter on_boundary, replace the body. + (decode_line_1): Provide the parameter to keep_name_info. + (decode_compound): Likewise. Drop the trailing java return type + handling. Twice. + +2011-07-01 Jan Kratochvil <jan.kratochvil@redhat.com> + Fall back linespec to minimal symbols. * linespec.c (decode_line_1): New variable ex, saved_argptr. Protect decode_compound by TRY_CATCH, fall back on minsyms if it failed. diff --git a/gdb/linespec.c b/gdb/linespec.c index 534560b..1b5b6f1 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -679,6 +679,14 @@ decode_line_2 (struct symbol *sym_arr[], int nelts, int funfirstline, return return_values; } +/* Valid delimiters for linespec keywords "if", "thread" or "task". */ + +static int +is_linespec_boundary (char c) +{ + return c == ' ' || c == '\t' || c == '\0' || c == ','; +} + /* A helper function for decode_line_1 and friends which skips P past any method overload information at the beginning of P, e.g., "(const struct foo *)". @@ -710,70 +718,55 @@ find_method_overload_end (char *p) return p; } -/* Does P point to a sequence of characters which implies the end - of a name? Terminals include "if" and "thread" clauses. */ - -static int -name_end (char *p) -{ - while (isspace (*p)) - ++p; - if (*p == 'i' && p[1] == 'f' - && (isspace (p[2]) || p[2] == '\0' || p[2] == '(')) - return 1; - - if (strncmp (p, "thread", 6) == 0 - && (isspace (p[6]) || p[6] == '\0')) - return 1; - - return 0; -} - /* Keep important information used when looking up a name. This includes - template parameters, overload information, and important keywords. */ + template parameters, overload information, and important keywords, including + the possible Java trailing type. */ static char * -keep_name_info (char *ptr) +keep_name_info (char *p, int on_boundary) { - char *p = ptr; - char *start = ptr; + const char *quotes = get_gdb_completer_quote_characters (); + char *saved_p = p; + int nest = 0; - /* Keep any template parameters. */ - if (name_end (ptr)) - return remove_trailing_whitespace (start, ptr); + while (*p) + { + if (strchr (quotes, *p)) + break; - p = skip_spaces (p); - if (*p == '<') - ptr = p = find_template_name_end (ptr); + if (*p == ',' && !nest) + break; - if (name_end (ptr)) - return remove_trailing_whitespace (start, ptr); + if (on_boundary && !nest) + { + const char *const words[] = { "if", "thread", "task" }; + int wordi; - /* Keep method overload information. */ - if (*p == '(') - ptr = p = find_method_overload_end (p); + for (wordi = 0; wordi < ARRAY_SIZE (words); wordi++) + if (strncmp (p, words[wordi], strlen (words[wordi])) == 0 + && is_linespec_boundary (p[strlen (words[wordi])])) + break; + if (wordi < ARRAY_SIZE (words)) + break; + } - if (name_end (ptr)) - return remove_trailing_whitespace (start, ptr); + if (*p == '(' || *p == '<' || *p == '[') + nest++; + else if ((*p == ')' || *p == '>' || *p == ']') && nest > 0) + nest--; - /* Keep important keywords. */ - while (1) - { - char *quotes = get_gdb_completer_quote_characters (); - p = skip_spaces (p); - if (strncmp (p, "const", 5) == 0 - && (isspace (p[5]) || p[5] == '\0' - || strchr (quotes, p[5]) != NULL)) - ptr = p = p + 5; - else if (strncmp (p, "volatile", 8) == 0 - && (isspace (p[8]) || p[8] == '\0' - || strchr (quotes, p[8]) != NULL)) - ptr = p = p + 8; - else - break; + p++; + + /* The ',' check could fail on "operator ,". */ + p += cp_validate_operator (p); + + on_boundary = is_linespec_boundary (p[-1]); } - return remove_trailing_whitespace (start, ptr); + while (p > saved_p && is_linespec_boundary (p[-1])) + p--; + + return p; } @@ -1034,7 +1027,7 @@ decode_line_1 (char **argptr, int funfirstline, struct symtab *default_symtab, } /* Keep any important naming information. */ - p = keep_name_info (p); + p = keep_name_info (p, p == saved_arg || is_linespec_boundary (p[-1])); copy = (char *) alloca (p - *argptr + 1); memcpy (copy, *argptr, p - *argptr); @@ -1380,7 +1373,6 @@ decode_compound (char **argptr, int funfirstline, char *copy; struct symbol *sym_class; struct type *t; - char *saved_java_argptr = NULL; char *saved_arg; /* If the user specified any completer quote characters in the input, @@ -1558,31 +1550,7 @@ decode_compound (char **argptr, int funfirstline, } /* Keep any important naming information. */ - p = keep_name_info (p); - - /* Java may append typenames, so assume that if there is - anything else left in *argptr, it must be a typename. */ - if (*p && current_language->la_language == language_java) - { - struct type *type; - - p2 = p; - while (*p2) - ++p2; - copy = (char *) alloca (p2 - p + 1); - memcpy (copy, p, p2 - p); - copy[p2 - p] = '\0'; - type = lookup_typename (current_language, get_current_arch (), - copy, NULL, 1); - if (type != NULL) - { - /* Save the location of this just in case this - method/type combination isn't actually defined. - It will be checked later. */ - saved_java_argptr = p; - p = p2; - } - } + p = keep_name_info (p, 1); } /* Allocate our own copy of the substring between argptr and @@ -1611,34 +1579,15 @@ decode_compound (char **argptr, int funfirstline, here, we return. If not, and we are at the and of the string, we'll lookup the whole string in the symbol tables. */ - values = find_method (funfirstline, canonical, saved_arg, - copy, t, sym_class, file_symtab); - if (saved_java_argptr != NULL && values.nelts == 1) - { - /* The user specified a specific return type for a java method. - Double-check that it really is the one the user specified. - [This is a necessary evil because strcmp_iw_ordered stops - comparisons too prematurely.] */ - sym = find_pc_sect_function (values.sals[0].pc, - values.sals[0].section); - /* We just found a SAL, we had better be able to go backwards! */ - gdb_assert (sym != NULL); - if (strcmp_iw (SYMBOL_LINKAGE_NAME (sym), saved_arg) != 0) - { - xfree (values.sals); - error (_("the class `%s' does not have " - "any method instance named %s"), - SYMBOL_PRINT_NAME (sym_class), copy); - } - } - return values; + return find_method (funfirstline, canonical, saved_arg, copy, t, + sym_class, file_symtab); } /* End if symbol found. */ /* We couldn't find a class, so we're in case 2 above. We check the entire name as a symbol instead. */ - p = keep_name_info (p); + p = keep_name_info (p, 1); copy = (char *) alloca (p - saved_arg2 + 1); memcpy (copy, saved_arg2, p - saved_arg2); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index ee88fc2..a0ecba7 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,17 @@ 2011-07-01 Jan Kratochvil <jan.kratochvil@redhat.com> + Stop on first linespec terminator instead of eating what we can. + * gdb.cp/minsym-fallback-main.cc (main): Call also C::operator (). + * gdb.cp/minsym-fallback.cc (C::operator ()): Define. + * gdb.cp/minsym-fallback.exp (break 'C::f()'): Change to ... + (break C::f()): ... this one. + (break C::operator()()): New test. + * gdb.cp/minsym-fallback.h (C::operator ()): Declare. + * gdb.java/jmisc.exp (break jmisc.main(java.lang.String[])int): New + test. + +2011-07-01 Jan Kratochvil <jan.kratochvil@redhat.com> + Fall back linespec to minimal symbols. * gdb.base/psymtab.exp (Don't search past end of psymtab.): Update the error message. diff --git a/gdb/testsuite/gdb.cp/minsym-fallback-main.cc b/gdb/testsuite/gdb.cp/minsym-fallback-main.cc index a82adef..d2a677b 100644 --- a/gdb/testsuite/gdb.cp/minsym-fallback-main.cc +++ b/gdb/testsuite/gdb.cp/minsym-fallback-main.cc @@ -23,4 +23,5 @@ int main () { c.f (); + c (); } diff --git a/gdb/testsuite/gdb.cp/minsym-fallback.cc b/gdb/testsuite/gdb.cp/minsym-fallback.cc index 1ecd289..1231f7d 100644 --- a/gdb/testsuite/gdb.cp/minsym-fallback.cc +++ b/gdb/testsuite/gdb.cp/minsym-fallback.cc @@ -21,3 +21,8 @@ void C::f () { } + +void +C::operator () () +{ +} diff --git a/gdb/testsuite/gdb.cp/minsym-fallback.exp b/gdb/testsuite/gdb.cp/minsym-fallback.exp index df95a2d..2006545 100644 --- a/gdb/testsuite/gdb.cp/minsym-fallback.exp +++ b/gdb/testsuite/gdb.cp/minsym-fallback.exp @@ -35,4 +35,6 @@ clean_restart ${executable} gdb_test_no_output "set breakpoint pending off" -gdb_test "break 'C::f()'" {Breakpoint [0-9]+ at 0x[0-9a-f]+} +gdb_test "break C::f()" {Breakpoint [0-9]+ at 0x[0-9a-f]+} + +gdb_test "break C::operator()()" {Breakpoint [0-9]+ at 0x[0-9a-f]+} diff --git a/gdb/testsuite/gdb.cp/minsym-fallback.h b/gdb/testsuite/gdb.cp/minsym-fallback.h index db32e45..88bcb5c 100644 --- a/gdb/testsuite/gdb.cp/minsym-fallback.h +++ b/gdb/testsuite/gdb.cp/minsym-fallback.h @@ -19,4 +19,5 @@ class C { public: static void f (); + void operator () (); }; diff --git a/gdb/testsuite/gdb.java/jmisc.exp b/gdb/testsuite/gdb.java/jmisc.exp index 2a95617..47a740c 100644 --- a/gdb/testsuite/gdb.java/jmisc.exp +++ b/gdb/testsuite/gdb.java/jmisc.exp @@ -104,4 +104,8 @@ if [set_lang_java] then { } } } + + # Test a non-mathing return type really fails the look up. + gdb_test_no_output "set breakpoint pending off" + gdb_test {break jmisc.main(java.lang.String[])int} {Function "jmisc\.main\(java\.lang\.String\[\]\)int" not defined\.} } |