From a737d952e0a9122dd0d439ba2a2ca531b070e6bd Mon Sep 17 00:00:00 2001 From: Tom Tromey Date: Tue, 17 Apr 2018 13:51:25 -0600 Subject: Remove type_name_no_tag and rename type_name_no_tag_or_error type_name_no_tag is just a plain wrapper for TYPE_NAME now, so this patch removes it. And, because tag names no longer exist, this renames type_name_no_tag_or_error to type_name_or_error. gdb/ChangeLog 2018-06-01 Tom Tromey * valops.c (value_cast_structs, destructor_name_p): Update. * symtab.c (gdb_mangle_name): Update. * stabsread.c (define_symbol, read_cpp_abbrev, read_baseclasses): Update. * p-valprint.c (pascal_object_is_vtbl_ptr_type) (pascal_object_print_value_fields, pascal_object_print_value): Update. * p-typeprint.c (pascal_type_print_derivation_info): Update. * linespec.c (find_methods): Update. * gdbtypes.h (type_name_no_tag): Remove. (type_name_or_error): Rename from type_name_no_tag_or_error. * gdbtypes.c (type_name_no_tag): Remove. (type_name_or_error): Rename from type_name_no_tag_or_error. (lookup_struct_elt_type, check_typedef): Update. * expprint.c (print_subexp_standard): Update. * dwarf2read.c (dwarf2_add_field, load_partial_dies): Update. * d-namespace.c (d_lookup_nested_symbol): Update. * cp-valprint.c (cp_is_vtbl_ptr_type, cp_print_value_fields) (cp_print_class_member): Update. * cp-namespace.c (cp_lookup_nested_symbol): Update. * completer.c (add_struct_fields): Update. * c-typeprint.c (cp_type_print_derivation_info) (c_type_print_varspec_prefix, c_type_print_base_struct_union): Update. * ada-lang.c (parse_old_style_renaming, xget_renaming_scope) (ada_prefer_type, ada_is_exception_sym): Update. --- gdb/ada-lang.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'gdb/ada-lang.c') diff --git a/gdb/ada-lang.c b/gdb/ada-lang.c index ceabf64c314..7d66a9ac550 100644 --- a/gdb/ada-lang.c +++ b/gdb/ada-lang.c @@ -4399,7 +4399,7 @@ parse_old_style_renaming (struct type *type, || TYPE_NFIELDS (type) != 1) return ADA_NOT_RENAMING; - name = type_name_no_tag (type); + name = TYPE_NAME (type); if (name == NULL) return ADA_NOT_RENAMING; @@ -5189,7 +5189,7 @@ xget_renaming_scope (struct type *renaming_type) So, to extract the scope, we search for the "___XR" extension, and then backtrack until we find the first "__". */ - const char *name = type_name_no_tag (renaming_type); + const char *name = TYPE_NAME (renaming_type); const char *suffix = strstr (name, "___XR"); const char *last; @@ -8101,8 +8101,8 @@ ada_prefer_type (struct type *type0, struct type *type1) return 1; else { - const char *type0_name = type_name_no_tag (type0); - const char *type1_name = type_name_no_tag (type1); + const char *type0_name = TYPE_NAME (type0); + const char *type1_name = TYPE_NAME (type1); if (type0_name != NULL && strstr (type0_name, "___XR") != NULL && (type1_name == NULL || strstr (type1_name, "___XR") == NULL)) @@ -13411,7 +13411,7 @@ catch_assert_command (const char *arg_entry, int from_tty, static int ada_is_exception_sym (struct symbol *sym) { - const char *type_name = type_name_no_tag (SYMBOL_TYPE (sym)); + const char *type_name = TYPE_NAME (SYMBOL_TYPE (sym)); return (SYMBOL_CLASS (sym) != LOC_TYPEDEF && SYMBOL_CLASS (sym) != LOC_BLOCK -- cgit v1.2.1