diff options
| -rw-r--r-- | gdb/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/gdbtypes.c | 7 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/gdb11530.c | 35 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.base/gdb11530.exp | 55 |
5 files changed, 109 insertions, 0 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6819a8e..8b6b822 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,5 +1,11 @@ 2010-05-11 Pierre Muller <muller@ics.u-strasbg.fr> + PR exp/11530. + * gdbtypes.c (lookup_struct_elt_type): Also lookup + names of unnamed structures or unions. + +2010-05-11 Pierre Muller <muller@ics.u-strasbg.fr> + * procfs.c (proc_watchpoint_address): New function. (procfs_stopped_by_watchpoint): Remove useless check after find_procinfo_or_die call. diff --git a/gdb/gdbtypes.c b/gdb/gdbtypes.c index cf23f17..3dc8176 100644 --- a/gdb/gdbtypes.c +++ b/gdb/gdbtypes.c @@ -1244,6 +1244,13 @@ lookup_struct_elt_type (struct type *type, char *name, int noerr) { return TYPE_FIELD_TYPE (type, i); } + else if (!t_field_name || *t_field_name == '\0') + { + struct type *subtype = lookup_struct_elt_type ( + TYPE_FIELD_TYPE (type, i), name, 1); + if (subtype != NULL) + return subtype; + } } /* OK, it's not in this class. Recursively check the baseclasses. */ diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index f532514..dd049b3 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2010-05-11 Pierre Muller <muller@ics.u-strasbg.fr> + + PR exp/11530. + * gdb.base/gdb11530.c: New file. + * gdb.base/gdb11530.exp: New file. + 2010-05-08 Jan Kratochvil <jan.kratochvil@redhat.com> * gdb.dwarf2/dw2-modula2-self-type.exp: New. diff --git a/gdb/testsuite/gdb.base/gdb11530.c b/gdb/testsuite/gdb.base/gdb11530.c new file mode 100644 index 0000000..a9e8873 --- /dev/null +++ b/gdb/testsuite/gdb.base/gdb11530.c @@ -0,0 +1,35 @@ +/* This testcase is part of GDB, the GNU debugger. + + Copyright 2010 Free Software Foundation, Inc. + + Contributed by Pierre Muller. + + 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/>. + + Test for problem related to unnamed unions. */ + +struct a + { + union + { + int i; + }; + } a; + +int +main (void) +{ + return sizeof (a.i); +} + diff --git a/gdb/testsuite/gdb.base/gdb11530.exp b/gdb/testsuite/gdb.base/gdb11530.exp new file mode 100644 index 0000000..437a4cb --- /dev/null +++ b/gdb/testsuite/gdb.base/gdb11530.exp @@ -0,0 +1,55 @@ +# This testcase is part of GDB, the GNU debugger. + +# Copyright 2010 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/>. + +# Test GDB bug report 11530. +# This is a problem related unnamed unions. + +if $tracelevel then { + strace $tracelevel +} + +set prms_id 0 +set bug_id 0 + +set testfile "gdb11530" +set binfile ${testfile}${EXEEXT} + +# Unnamed union is a GNU extension, thus we restrict the test +# to gcc compiler. + +if [get_compiler_info ${binfile}] { + return -1; +} + +if { ![test_compiler_info gcc*] } { + return 0; +} + +if { [prepare_for_testing $testfile.exp $testfile $testfile.c {debug}] } { + return -1; +} + + +if { ![runto main] } then { + fail "run to main" + return +} + +gdb_test "print a.i" " = 0" +gdb_test "print sizeof (a.i)" " = \[0-9\]+" +gdb_test "print sizeof (a.i) == sizeof (int)" " = 1" + |