OpenE2K
/
binutils-gdb
12
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

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.
This commit is contained in:
Tom Tromey 2012-12-14 21:19:11 +00:00
parent 7d27a96df4
commit 6592e36f33
6 changed files with 154 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
gdb/ChangeLog
View File

@ -1,3 +1,11 @@
2012-12-14 Tom Tromey <tromey@redhat.com>
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 <tromey@redhat.com>
Partial fix for PR c++/14160:

21
gdb/c-exp.y
View File

@ -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)

5
gdb/symtab.c
View File

@ -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);

5
gdb/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2012-12-14 Tom Tromey <tromey@redhat.com>
* gdb.cp/member-name.exp: New file.
* gdb.cp/member-name.cc: New file.
2012-12-14 Tom Tromey <tromey@redhat.com>
* gdb.cp/templates.exp (test_ptype_of_templates): Update kfails.

73
gdb/testsuite/gdb.cp/member-name.cc Normal file
View File

@ -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 <http://www.gnu.org/licenses/>.
*/
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<typename T>
struct Templ
{
static int y;
int m()
{
// Third breakpoint here
return Templ::y;
}
};
template<typename T> int Templ<T>::y = 23;
int main ()
{
C c;
Templ<int> t;
return c.m() + t.m();
}

43
gdb/testsuite/gdb.cp/member-name.exp Normal file
View File

@ -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 <http://www.gnu.org/licenses/>.
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<int>::y" " = 23" "print Templ::y from third breakpoint"