diff options
| -rw-r--r-- | gdb/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/ChangeLog | 5 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/mi-var-create-rtti.c | 24 | ||||
| -rw-r--r-- | gdb/testsuite/gdb.mi/mi-var-create-rtti.exp | 52 | ||||
| -rw-r--r-- | gdb/value.c | 6 |
5 files changed, 91 insertions, 1 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 6bd3159f127..785160d3374 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,8 @@ +2012-11-14 Luis Machado <lgustavo@codesourcery.com> + + * value.c (value_actual_type): Check for TYPE_CODE_STRUCT + target types. + 2012-11-14 Tom Tromey <tromey@redhat.com> * configure, config.in: Rebuild. diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 3d52b979634..e804ba8c7f2 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,5 +1,10 @@ 2012-11-14 Luis Machado <lgustavo@codesourcery.com> + * gdb.mi/mi-var-create-rtti.c: New file. + * gdb.mi/mi-var-create-rtti.exp: New file. + +2012-11-14 Luis Machado <lgustavo@codesourcery.com> + * gdb.base/structs3.exp: Run to main before doing any tests. 2012-11-14 Andrew Burgess <aburgess@broadcom.com> diff --git a/gdb/testsuite/gdb.mi/mi-var-create-rtti.c b/gdb/testsuite/gdb.mi/mi-var-create-rtti.c new file mode 100644 index 00000000000..897c59d22a4 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-var-create-rtti.c @@ -0,0 +1,24 @@ +/* This testcase is part of GDB, the GNU debugger. + + 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/>. */ + +int +main (void) +{ + int i = 0; + + return i; /* next-line */ +} diff --git a/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp b/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp new file mode 100644 index 00000000000..16d8551d161 --- /dev/null +++ b/gdb/testsuite/gdb.mi/mi-var-create-rtti.exp @@ -0,0 +1,52 @@ +# 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/>. + +load_lib mi-support.exp +set MIFLAGS "-i=mi" + +gdb_exit +if [mi_gdb_start] { + continue +} + +standard_testfile .c +set opts {debug} + +if [build_executable $testfile.exp $testfile $srcfile $opts] { + return -1 +} + +mi_delete_breakpoints +mi_gdb_reinitialize_dir $srcdir/$subdir +mi_gdb_load ${binfile} + +if ![mi_run_to_main] { + untested "could not run to main" + return -1 +} + +# Test creating a register-based variable. We pick +# register SP since it is a pointer to data. This checks +# for a regression when creating MI variables from pointers +# with "print object" enabled. + +# Enable "print object" +mi_gdb_test "-gdb-set print object on" ".*" + +# Test creating a variable for $sp +mi_gdb_test "-var-create sp1 * \$sp" \ + "\\^done,name=\"sp1\",numchild=\"0\",value=\"$hex\",type=\"void \\*\",has_more=\"0\"" \ + "-var-create sp1 * \$sp" +gdb_exit diff --git a/gdb/value.c b/gdb/value.c index 3feb1ca5518..2a1e1f262d8 100644 --- a/gdb/value.c +++ b/gdb/value.c @@ -850,8 +850,12 @@ value_actual_type (struct value *value, int resolve_simple_types, result = value_type (value); if (opts.objectprint) { - if (TYPE_CODE (result) == TYPE_CODE_PTR + /* If result's target type is TYPE_CODE_STRUCT, proceed to + fetch its rtti type. */ + if ((TYPE_CODE (result) == TYPE_CODE_PTR || TYPE_CODE (result) == TYPE_CODE_REF) + && TYPE_CODE (check_typedef (TYPE_TARGET_TYPE (result))) + == TYPE_CODE_STRUCT) { struct type *real_type; |