From 87b3ede8aff95551e9bc26afbfb143c4c0941095 Mon Sep 17 00:00:00 2001 From: David Carlton Date: Wed, 11 Feb 2004 18:04:14 +0000 Subject: [PATCH] 2004-02-11 David Carlton * linespec.c (decode_compound): Only look for a class symbol when considering all but the rightmost component. 2004-02-11 David Carlton * gdb.cp/breakpoint.exp: New. * gdb.cp/breakpoint.cc: New. --- gdb/ChangeLog | 5 + gdb/linespec.c | 188 ++++++++++++++-------------- gdb/testsuite/ChangeLog | 5 + gdb/testsuite/gdb.cp/breakpoint.cc | 41 ++++++ gdb/testsuite/gdb.cp/breakpoint.exp | 65 ++++++++++ 5 files changed, 208 insertions(+), 96 deletions(-) create mode 100644 gdb/testsuite/gdb.cp/breakpoint.cc create mode 100644 gdb/testsuite/gdb.cp/breakpoint.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 651853e71e3..d2999043306 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2004-02-11 David Carlton + + * linespec.c (decode_compound): Only look for a class symbol when + considering all but the rightmost component. + 2004-02-11 Andrew Cagney * hppa-tdep.c (hppa_gdbarch_init): Re-order so that the frame and diff --git a/gdb/linespec.c b/gdb/linespec.c index d362f1cc5f0..eedc671fd00 100644 --- a/gdb/linespec.c +++ b/gdb/linespec.c @@ -1180,25 +1180,19 @@ decode_compound (char **argptr, int funfirstline, char ***canonical, && ((*argptr == p) || (p[-1] == ' ') || (p[-1] == '\t'))) saved_arg2 += 2; - /* We have what looks like a class or namespace - scope specification (A::B), possibly with many - levels of namespaces or classes (A::B::C::D). - - Some versions of the HP ANSI C++ compiler (as also possibly - other compilers) generate class/function/member names with - embedded double-colons if they are inside namespaces. To - handle this, we loop a few times, considering larger and - larger prefixes of the string as though they were single - symbols. So, if the initially supplied string is - A::B::C::D::foo, we have to look up "A", then "A::B", - then "A::B::C", then "A::B::C::D", and finally - "A::B::C::D::foo" as single, monolithic symbols, because - A, B, C or D may be namespaces. - - Note that namespaces can nest only inside other - namespaces, and not inside classes. So we need only - consider *prefixes* of the string; there is no need to look up - "B::C" separately as a symbol in the previous example. */ + /* Given our example "AAA::inA::fun", we have two cases to consider: + + 1) AAA::inA is the name of a class. In that case, presumably it + has a method called "fun"; we then look up that method using + find_method. + + 2) AAA::inA isn't the name of a class. In that case, either the + user made a typo or AAA::inA is the name of a namespace. + Either way, we just look up AAA::inA::fun with lookup_symbol. + + Thus, our first task is to find everything before the last set of + double-colons and figure out if it's the name of a class. So we + first loop through all of the double-colons. */ p2 = p; /* Save for restart. */ @@ -1215,78 +1209,6 @@ decode_compound (char **argptr, int funfirstline, char ***canonical, while (1) { - - /* Start of lookup in the symbol tables. */ - - /* Lookup in the symbol table the substring between argptr and - p. Note, this call changes the value of argptr. */ - /* PASS1: Before the call, argptr->"AAA::inA::fun", - p->"::inA::fun". After the call: argptr->"inA::fun", p - unchanged. */ - /* PASS2: Before the call, argptr->"AAA::inA::fun", p->"::fun". - After the call: argptr->"fun", p->"::fun". */ - sym_class = lookup_prefix_sym (argptr, p); - - /* PASS1: assume sym_class == NULL. Skip the whole if-stmt. */ - /* PASS2: assume sym_class has been found, i.e. "AAA::inA" is a - class. Enter the if-stmt. */ - if (sym_class && - (t = check_typedef (SYMBOL_TYPE (sym_class)), - (TYPE_CODE (t) == TYPE_CODE_STRUCT - || TYPE_CODE (t) == TYPE_CODE_UNION))) - { - /* Arg token is not digits => try it as a function name. - Find the next token (everything up to end or next - blank). */ - if (**argptr - && strchr (get_gdb_completer_quote_characters (), - **argptr) != NULL) - { - p = skip_quoted (*argptr); - *argptr = *argptr + 1; - } - else - { - /* PASS2: at this point argptr->"fun". */ - p = *argptr; - while (*p && *p != ' ' && *p != '\t' && *p != ',' && *p != ':') - p++; - /* PASS2: at this point p->"". String ended. */ - } - - /* Allocate our own copy of the substring between argptr and - p. */ - copy = (char *) alloca (p - *argptr + 1); - memcpy (copy, *argptr, p - *argptr); - copy[p - *argptr] = '\0'; - if (p != *argptr - && copy[p - *argptr - 1] - && strchr (get_gdb_completer_quote_characters (), - copy[p - *argptr - 1]) != NULL) - copy[p - *argptr - 1] = '\0'; - - /* PASS2: At this point copy->"fun", p->"" */ - - /* No line number may be specified. */ - while (*p == ' ' || *p == '\t') - p++; - *argptr = p; - - /* Look for copy as a method of sym_class. */ - /* PASS2: at this point copy->"fun", sym_class is "AAA:inA". - This concludes the scanning of the string for possible - components matches. If we find it here, we return. If - not, and we are at the and of the string, we'll get out - of the loop and lookup the whole string in the symbol - tables. */ - - return find_method (funfirstline, canonical, saved_arg, - copy, t, sym_class); - } /* End if symbol found */ - - /* End of lookup in the symbol tables. */ - - /* Prepare for next run through the loop. */ /* Move pointer up to next possible class/namespace token. */ p = p2 + 1; /* Restart with old value +1. */ @@ -1294,6 +1216,7 @@ decode_compound (char **argptr, int funfirstline, char ***canonical, /* PASS1: at this point p2->"::inA::fun", so p->":inA::fun", i.e. if there is a double-colon, p will now point to the second colon. */ + /* PASS2: p2->"::fun", p->":fun" */ /* Move pointer ahead to next double-colon. */ while (*p && (p[0] != ' ') && (p[0] != '\t') && (p[0] != '\'')) @@ -1313,9 +1236,12 @@ decode_compound (char **argptr, int funfirstline, char ***canonical, the beginning of this loop (PASS1), we had p->":inA::fun", we'll trigger this when p has been advanced to point to "::fun". */ + /* PASS2: we will not trigger this. */ else if ((p[0] == ':') && (p[1] == ':')) break; /* Found double-colon. */ else + /* PASS2: We'll keep getting here, until p->"", at which point + we exit this loop. */ p++; } @@ -1323,7 +1249,7 @@ decode_compound (char **argptr, int funfirstline, char ***canonical, break; /* Out of the while (1). This would happen for instance if we have looked up unsuccessfully all the components of the - string, and p->"". */ + string, and p->""(PASS2) */ /* We get here if p points to ' ', '\t', '\'', "::" or ""(i.e string ended). */ @@ -1331,14 +1257,84 @@ decode_compound (char **argptr, int funfirstline, char ***canonical, p2 = p; /* Restore argptr as it was on entry to this function. */ *argptr = saved_arg2; - /* PASS1: at this point p->"::fun" argptr->"AAA::inA::fun". */ + /* PASS1: at this point p->"::fun" argptr->"AAA::inA::fun", + p2->"::fun". */ /* All ready for next pass through the loop. */ } /* while (1) */ - /* Last chance attempt -- check entire name as a symbol. Use "copy" - in preparation for jumping out of this block, to be consistent - with usage following the jump target. */ + + /* Start of lookup in the symbol tables. */ + + /* Lookup in the symbol table the substring between argptr and + p. Note, this call changes the value of argptr. */ + /* Before the call, argptr->"AAA::inA::fun", + p->"", p2->"::fun". After the call: argptr->"fun", p, p2 + unchanged. */ + sym_class = lookup_prefix_sym (argptr, p2); + + /* If sym_class has been found, and if "AAA::inA" is a class, then + we're in case 1 above. So we look up "fun" as a method of that + class. */ + if (sym_class && + (t = check_typedef (SYMBOL_TYPE (sym_class)), + (TYPE_CODE (t) == TYPE_CODE_STRUCT + || TYPE_CODE (t) == TYPE_CODE_UNION))) + { + /* Arg token is not digits => try it as a function name. + Find the next token (everything up to end or next + blank). */ + if (**argptr + && strchr (get_gdb_completer_quote_characters (), + **argptr) != NULL) + { + p = skip_quoted (*argptr); + *argptr = *argptr + 1; + } + else + { + /* At this point argptr->"fun". */ + p = *argptr; + while (*p && *p != ' ' && *p != '\t' && *p != ',' && *p != ':') + p++; + /* At this point p->"". String ended. */ + } + + /* Allocate our own copy of the substring between argptr and + p. */ + copy = (char *) alloca (p - *argptr + 1); + memcpy (copy, *argptr, p - *argptr); + copy[p - *argptr] = '\0'; + if (p != *argptr + && copy[p - *argptr - 1] + && strchr (get_gdb_completer_quote_characters (), + copy[p - *argptr - 1]) != NULL) + copy[p - *argptr - 1] = '\0'; + + /* At this point copy->"fun", p->"" */ + + /* No line number may be specified. */ + while (*p == ' ' || *p == '\t') + p++; + *argptr = p; + /* At this point arptr->"". */ + + /* Look for copy as a method of sym_class. */ + /* At this point copy->"fun", sym_class is "AAA:inA", + saved_arg->"AAA::inA::fun". This concludes the scanning of + the string for possible components matches. If we find it + here, we return. If not, and we are at the and of the string, + we'll lookup the whole string in the symbol tables. */ + + return find_method (funfirstline, canonical, saved_arg, + copy, t, sym_class); + + } /* 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. */ + copy = (char *) alloca (p - saved_arg2 + 1); memcpy (copy, saved_arg2, p - saved_arg2); /* Note: if is_quoted should be true, we snuff out quote here diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 4ea1cb421de..fb73ed17777 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2004-02-11 David Carlton + + * gdb.cp/breakpoint.exp: New. + * gdb.cp/breakpoint.cc: New. + 2004-02-11 Michael Chastain Partial fix for PR gdb/1543. diff --git a/gdb/testsuite/gdb.cp/breakpoint.cc b/gdb/testsuite/gdb.cp/breakpoint.cc new file mode 100644 index 00000000000..266007cced0 --- /dev/null +++ b/gdb/testsuite/gdb.cp/breakpoint.cc @@ -0,0 +1,41 @@ +/* Code to go along with tests in breakpoint.exp. + + Copyright 2004 Free Software Foundation, Inc. + + This file is part of GDB. + + This program is free software; you can redistribute it and/or modify + it under the terms of the GNU General Public License as published by + the Free Software Foundation; either version 2 of the License, or (at + your option) any later version. + + This program is distributed in the hope that it will be useful, but + WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + General Public License for more details. + + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 59 Temple Place - Suite 330, + Boston, MA 02111-1307, USA. */ + +class C1 { +public: + class Nested { + public: + int + foo () + { + return 1; + } + }; +}; + +int main () +{ + C1::Nested c1; + + c1.foo(); + + return 0; +} diff --git a/gdb/testsuite/gdb.cp/breakpoint.exp b/gdb/testsuite/gdb.cp/breakpoint.exp new file mode 100644 index 00000000000..c85f80541e1 --- /dev/null +++ b/gdb/testsuite/gdb.cp/breakpoint.exp @@ -0,0 +1,65 @@ +# Copyright 2004 Free Software Foundation, Inc. + +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation; either version 2 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. + +# This file is part of the gdb testsuite. + +# This contains tests for breakpoints in C++. + +if $tracelevel then { + strace $tracelevel + } + +if { [skip_cplus_tests] } { continue } + +# +# test running programs +# +set prms_id 0 +set bug_id 0 + +set testfile "breakpoint" +set srcfile ${testfile}.cc +set binfile ${objdir}/${subdir}/${testfile} + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug c++}] != "" } { + gdb_suppress_entire_file "Testcase compile failed, so all tests in this file will automatically fail." +} + +if [get_compiler_info ${binfile} "c++"] { + return -1 +} + +gdb_exit +gdb_start +gdb_reinitialize_dir $srcdir/$subdir +gdb_load ${binfile} + +proc test_breakpoint {name} { + # Restart the program every time, so that a single failure doesn't + # lead to a cascade. + if ![runto_main] then { + perror "couldn't run to main when testing ${name}" + continue + } else { + gdb_breakpoint "${name}" + gdb_test "continue" "Continuing.\r\n\r\nBreakpoint \[0-9\]*, ${name}.*" "continue to ${name}" + } +} + +test_breakpoint "C1::Nested::foo" + +gdb_exit +return 0 -- 2.30.2