diff options
| -rw-r--r-- | gdb/ChangeLog | 10 | ||||
| -rw-r--r-- | gdb/c-typeprint.c | 6 | ||||
| -rw-r--r-- | gdb/jv-typeprint.c | 16 |
3 files changed, 26 insertions, 6 deletions
diff --git a/gdb/ChangeLog b/gdb/ChangeLog index 8dc87d0..491326c 100644 --- a/gdb/ChangeLog +++ b/gdb/ChangeLog @@ -1,3 +1,13 @@ +2010-03-30 Keith Seitz <keiths@redhat.com> + + * c-typeprint.c (c_type_print_args): Don't print "void" + for java, regardless of whether it is TYPE_PROTOTYPED. + Use the passed-in language instead of current_language. + (c_type_print_varspec_suffix): Use current_language instead + of assuming language_c. + * jv-typeprint.c (java_type_print_base): (bz 9320) Strip off + any return type specifier from the physname. + 2010-03-30 Pedro Alves <pedro@codesourcery.com> * tui/tui-interp.c (tui_is_toplevel): New. diff --git a/gdb/c-typeprint.c b/gdb/c-typeprint.c index 5cc5f6b..68bcbd7 100644 --- a/gdb/c-typeprint.c +++ b/gdb/c-typeprint.c @@ -416,8 +416,8 @@ c_type_print_args (struct type *type, struct ui_file *stream, } } else if (!printed_any - && (TYPE_PROTOTYPED (type) - || current_language->la_language == language_cplus)) + && ((TYPE_PROTOTYPED (type) && language != language_java) + || language == language_cplus)) fprintf_filtered (stream, "void"); fprintf_filtered (stream, ")"); @@ -616,7 +616,7 @@ c_type_print_varspec_suffix (struct type *type, struct ui_file *stream, if (passed_a_ptr) fprintf_filtered (stream, ")"); if (!demangled_args) - c_type_print_args (type, stream, 1, language_c); + c_type_print_args (type, stream, 1, current_language->la_language); c_type_print_varspec_suffix (TYPE_TARGET_TYPE (type), stream, show, passed_a_ptr, 0); break; diff --git a/gdb/jv-typeprint.c b/gdb/jv-typeprint.c index 03b6036..6132576 100644 --- a/gdb/jv-typeprint.c +++ b/gdb/jv-typeprint.c @@ -28,6 +28,7 @@ #include "typeprint.h" #include "c-lang.h" #include "cp-abi.h" +#include "gdb_assert.h" /* Local functions */ @@ -219,10 +220,19 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show, for (j = 0; j < n_overloads; j++) { - char *physname; + char *real_physname, *physname, *p; int is_full_physname_constructor; - physname = TYPE_FN_FIELD_PHYSNAME (f, j); + real_physname = TYPE_FN_FIELD_PHYSNAME (f, j); + + /* The physname will contain the return type + after the final closing parenthesis. Strip it off. */ + p = strrchr (real_physname, ')'); + gdb_assert (p != NULL); + ++p; /* Keep the trailing ')'. */ + physname = alloca (p - real_physname + 1); + memcpy (physname, real_physname, p - real_physname); + physname[p - real_physname] = '\0'; is_full_physname_constructor = (is_constructor_name (physname) @@ -268,7 +278,7 @@ java_type_print_base (struct type *type, struct ui_file *stream, int show, /* Build something we can demangle. */ mangled_name = gdb_mangle_name (type, i, j); else - mangled_name = TYPE_FN_FIELD_PHYSNAME (f, j); + mangled_name = physname; demangled_name = cplus_demangle (mangled_name, |