From 6592e36f33270932ce9f9d19fd6488b3754c1b95 Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Fri, 14 Dec 2012 21:19:11 +0000 Subject: [PATCH] PR c++/8888: * symtab.c (lookup_symbol_aux): If constructor is found, consider returning the type instead. * c-exp.y (classify_name): Check STRUCT_DOMAIN if a constructor is found. testsuite * gdb.cp/member-name.exp: New file. * gdb.cp/member-name.cc: New file. --- gdb/ChangeLog | 8 ++++ gdb/c-exp.y | 21 +++++++++++ gdb/symtab.c | 5 ++- gdb/testsuite/ChangeLog | 5 +++ gdb/testsuite/gdb.cp/member-name.cc | 73 ++++++++++++++++++++++++++++++++++++ gdb/testsuite/gdb.cp/member-name.exp | 43 +++++++++++++++++++++ 6 files changed, 154 insertions(+), 1 deletion(-) create mode 100644 gdb/testsuite/gdb.cp/member-name.cc create mode 100644 gdb/testsuite/gdb.cp/member-name.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8e75bbe..19cdae4 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,13 @@ 2012-12-14 Tom Tromey + PR c++/8888: + * symtab.c (lookup_symbol_aux): If constructor is found, consider + returning the type instead. + * c-exp.y (classify_name): Check STRUCT_DOMAIN if a constructor is + found. + +2012-12-14 Tom Tromey + Partial fix for PR c++/14160: * c-typeprint.c (c_type_print_base): Use TYPE_FN_FIELD_CONSTRUCTOR. * dwarf2read.c (dwarf2_is_constructor): New function. diff --git a/gdb/c-exp.y b/gdb/c-exp.y index 2c6eeda..fe5ddf8 100644 --- a/gdb/c-exp.y +++ b/gdb/c-exp.y @@ -55,6 +55,7 @@ #include "macroscope.h" #include "objc-lang.h" #include "typeprint.h" +#include "cp-abi.h" #define parse_type builtin_type (parse_gdbarch) @@ -2780,6 +2781,26 @@ classify_name (const struct block *block) yylval.bval = BLOCKVECTOR_BLOCK (BLOCKVECTOR (symtab), STATIC_BLOCK); return FILENAME; } + + /* If we found a field of 'this', we might have erroneously + found a constructor where we wanted a type name. Handle this + case by noticing that we found a constructor and then look up + the type tag instead. */ + if (is_a_field_of_this.type != NULL + && is_a_field_of_this.fn_field != NULL + && TYPE_FN_FIELD_CONSTRUCTOR (is_a_field_of_this.fn_field->fn_fields, + 0)) + { + struct field_of_this_result inner_is_a_field_of_this; + + sym = lookup_symbol (copy, block, STRUCT_DOMAIN, + &inner_is_a_field_of_this); + if (sym != NULL) + { + yylval.tsym.type = SYMBOL_TYPE (sym); + return TYPENAME; + } + } } if (sym && SYMBOL_CLASS (sym) == LOC_TYPEDEF) diff --git a/gdb/symtab.c b/gdb/symtab.c index 97f114f..50ba92a 100644 --- a/gdb/symtab.c +++ b/gdb/symtab.c @@ -1354,7 +1354,10 @@ lookup_symbol_aux (const char *name, const struct block *block, langdef = language_def (language); - if (is_a_field_of_this != NULL) + /* Don't do this check if we are searching for a struct. It will + not be found by check_field, but will be found by other + means. */ + if (is_a_field_of_this != NULL && domain != STRUCT_DOMAIN) { struct symbol *sym = lookup_language_this (langdef, block); diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 1fccb0b..d55a0c3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2012-12-14 Tom Tromey + * gdb.cp/member-name.exp: New file. + * gdb.cp/member-name.cc: New file. + +2012-12-14 Tom Tromey + * gdb.cp/templates.exp (test_ptype_of_templates): Update kfails. 2012-12-14 Doug Evans diff --git a/gdb/testsuite/gdb.cp/member-name.cc b/gdb/testsuite/gdb.cp/member-name.cc new file mode 100644 index 0000000..b2d59e4 --- /dev/null +++ b/gdb/testsuite/gdb.cp/member-name.cc @@ -0,0 +1,73 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2003-2004, 2007-2012 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 3 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, see . + */ + +struct B +{ + static int b; +}; + +int B::b = 23; + +struct C : public B +{ + static int x; + + struct inner + { + static int z; + }; + + int y; + + C () + { + // First breakpoint here + y = x + inner::z; + } + + int m () + { + // Second breakpoint here + return x - y; + } +}; + +int C::x = 23; +int C::inner::z = 0; + +template +struct Templ +{ + static int y; + + int m() + { + // Third breakpoint here + return Templ::y; + } +}; + +template int Templ::y = 23; + +int main () +{ + C c; + Templ t; + + return c.m() + t.m(); +} diff --git a/gdb/testsuite/gdb.cp/member-name.exp b/gdb/testsuite/gdb.cp/member-name.exp new file mode 100644 index 0000000..1241535 --- /dev/null +++ b/gdb/testsuite/gdb.cp/member-name.exp @@ -0,0 +1,43 @@ +# Copyright 2012 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 3 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, see . + +if { [skip_cplus_tests] } { continue } + +standard_testfile .cc + +if {[prepare_for_testing $testfile.exp $testfile $srcfile {debug c++}]} { + return -1 +} + +if ![runto_main] then { + perror "couldn't run to breakpoint" + return +} + +gdb_breakpoint ${srcfile}:[gdb_get_line_number "First breakpoint"] +gdb_continue_to_breakpoint "continue to first breakpoint" +gdb_test "print C::x" " = 23" "print C::x from first breakpoint" +gdb_test "print B::b" " = 23" "print B::b from first breakpoint" +gdb_test "print inner::z" " = 0" "print inner::z from first breakpoint" + +gdb_breakpoint ${srcfile}:[gdb_get_line_number "Second breakpoint"] +gdb_continue_to_breakpoint "continue to second breakpoint" +gdb_test "print C::x" " = 23" "print C::x from second breakpoint" +gdb_test "print B::b" " = 23" "print B::b from second breakpoint" +gdb_test "print inner::z" " = 0" "print inner::z from second breakpoint" + +gdb_breakpoint ${srcfile}:[gdb_get_line_number "Third breakpoint"] +gdb_continue_to_breakpoint "continue to third breakpoint" +gdb_test "print Templ::y" " = 23" "print Templ::y from third breakpoint" -- 2.7.4