From cf309262d9828b6aad71e01f727a9fa2e0776a4e Mon Sep 17 00:00:00 2001 From: Daniel Jacobowitz Date: Thu, 10 Feb 2005 18:15:44 +0000 Subject: [PATCH] From Ramana Radhakrishnan : PR exp/1821 * cp-valprint.c: Include "language.h". (cp_print_value_fields): Pass the current language to fprintf_symbol_filtered. * Makefile.in (cp-valprint.o): Update dependencies. testsuite/ From Ramana Radhakrishnan : PR exp/1821 * gdb.base/gdb1821.c: New test file. * gdb.base/gdb1821.exp: New test file. --- gdb/ChangeLog | 9 +++++++ gdb/Makefile.in | 2 +- gdb/cp-valprint.c | 7 ++--- gdb/testsuite/ChangeLog | 7 +++++ gdb/testsuite/gdb.base/gdb1821.c | 25 +++++++++++++++++ gdb/testsuite/gdb.base/gdb1821.exp | 43 ++++++++++++++++++++++++++++++ 6 files changed, 89 insertions(+), 4 deletions(-) create mode 100644 gdb/testsuite/gdb.base/gdb1821.c create mode 100644 gdb/testsuite/gdb.base/gdb1821.exp diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 0b06bd08098..e18557ac5b0 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,12 @@ +2005-02-10 Daniel Jacobowitz + + From Ramana Radhakrishnan : + PR exp/1821 + * cp-valprint.c: Include "language.h". + (cp_print_value_fields): Pass the current language to + fprintf_symbol_filtered. + * Makefile.in (cp-valprint.o): Update dependencies. + 2005-02-10 Andrew Cagney * cli/cli-decode.c (add_setshow_enum_cmd, add_setshow_cmd_full) diff --git a/gdb/Makefile.in b/gdb/Makefile.in index ce0b106c6b3..8ee2c3f0fc2 100644 --- a/gdb/Makefile.in +++ b/gdb/Makefile.in @@ -1823,7 +1823,7 @@ cpu32bug-rom.o: cpu32bug-rom.c $(defs_h) $(gdbcore_h) $(target_h) \ cp-valprint.o: cp-valprint.c $(defs_h) $(gdb_obstack_h) $(symtab_h) \ $(gdbtypes_h) $(expression_h) $(value_h) $(command_h) $(gdbcmd_h) \ $(demangle_h) $(annotate_h) $(gdb_string_h) $(c_lang_h) $(target_h) \ - $(cp_abi_h) $(valprint_h) $(cp_support_h) + $(cp_abi_h) $(valprint_h) $(cp_support_h) $(language_h) cris-tdep.o: cris-tdep.c $(defs_h) $(frame_h) $(frame_unwind_h) \ $(frame_base_h) $(trad_frame_h) $(dwarf2_frame_h) $(symtab_h) \ $(inferior_h) $(gdbtypes_h) $(gdbcore_h) $(gdbcmd_h) $(target_h) \ diff --git a/gdb/cp-valprint.c b/gdb/cp-valprint.c index 51c2129091e..9fdf869883e 100644 --- a/gdb/cp-valprint.c +++ b/gdb/cp-valprint.c @@ -36,6 +36,7 @@ #include "cp-abi.h" #include "valprint.h" #include "cp-support.h" +#include "language.h" int vtblprint; /* Controls printing of vtbl's */ int objectprint; /* Controls looking up an object's derived type @@ -319,11 +320,11 @@ cp_print_value_fields (struct type *type, struct type *real_type, if (TYPE_FIELD_STATIC (type, i)) fputs_filtered ("static ", stream); fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i), - language_cplus, + current_language->la_language, DMGL_PARAMS | DMGL_ANSI); fputs_filtered ("\" \"", stream); fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i), - language_cplus, + current_language->la_language, DMGL_PARAMS | DMGL_ANSI); fputs_filtered ("\") \"", stream); } @@ -334,7 +335,7 @@ cp_print_value_fields (struct type *type, struct type *real_type, if (TYPE_FIELD_STATIC (type, i)) fputs_filtered ("static ", stream); fprintf_symbol_filtered (stream, TYPE_FIELD_NAME (type, i), - language_cplus, + current_language->la_language, DMGL_PARAMS | DMGL_ANSI); annotate_field_name_end (); /* do not print leading '=' in case of anonymous unions */ diff --git a/gdb/testsuite/ChangeLog b/gdb/testsuite/ChangeLog index 7ced22ef500..2b6b897b288 100644 --- a/gdb/testsuite/ChangeLog +++ b/gdb/testsuite/ChangeLog @@ -1,3 +1,10 @@ +2005-02-10 Daniel Jacobowitz + + From Ramana Radhakrishnan : + PR exp/1821 + * gdb.base/gdb1821.c: New test file. + * gdb.base/gdb1821.exp: New test file. + 2005-02-09 Joel Brobecker * gdb.base/start.c: New file. diff --git a/gdb/testsuite/gdb.base/gdb1821.c b/gdb/testsuite/gdb.base/gdb1821.c new file mode 100644 index 00000000000..a4def6ecb0a --- /dev/null +++ b/gdb/testsuite/gdb.base/gdb1821.c @@ -0,0 +1,25 @@ +/* Test printing of structure member names in gdb. PR exp/1821 + + Copyright 2005, 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. */ + +struct foo { double x__0, y__0, z__1; } bar; + + +int main(void) { return 0; } diff --git a/gdb/testsuite/gdb.base/gdb1821.exp b/gdb/testsuite/gdb.base/gdb1821.exp new file mode 100644 index 00000000000..b2066fc26f4 --- /dev/null +++ b/gdb/testsuite/gdb.base/gdb1821.exp @@ -0,0 +1,43 @@ +# Copyright 2005 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. + +# Tests for PR gdb/1821. +# 2004-12-06 Ramana Radhakrishnan + +# This file is part of the gdb testsuite. + +# +# test running programs +# + +set testfile "gdb1821" +set srcfile ${testfile}.c +set binfile ${objdir}/${subdir}/${testfile} + +if { [gdb_compile "${srcdir}/${subdir}/${srcfile}" "${binfile}" executable {debug}] != "" } { + return -1 +} + +gdb_exit +gdb_start +gdb_load ${binfile} + +if ![runto_main] then { + perror "couldn't run to breakpoint" + continue +} +gdb_test "print /x bar" "{x__0 = 0x0, y__0 = 0x0, z__1 = 0x0}" + -- 2.30.2