===================================================================
@@ -311,8 +311,7 @@ static void dbxout_typedefs (tree);
static void dbxout_type_index (tree);
static void dbxout_args (tree);
static void dbxout_type_fields (tree);
-static void dbxout_type_method_1 (tree);
-static void dbxout_type_methods (tree);
+static void dbxout_type_fn_member (tree);
static void dbxout_range_type (tree, tree, tree);
static void dbxout_type (tree, int);
static bool print_int_cst_bounds_in_octal_p (tree, tree, tree);
@@ -1493,6 +1492,8 @@ dbxout_type_fields (tree type)
|| ! tree_fits_uhwi_p (DECL_SIZE (tem)))))
continue;
+ else if (TREE_CODE (tem) == FUNCTION_DECL)
+ dbxout_type_fn_member (tem);
else if (TREE_CODE (tem) != CONST_DECL)
{
/* Continue the line if necessary,
@@ -1542,14 +1543,23 @@ dbxout_type_fields (tree type)
}
}
-/* Subroutine of `dbxout_type_methods'. Output debug info about the
- method described DECL. */
+/* Subroutine of `dbxout_type'. Output debug info about the
+ function member DECL. */
static void
-dbxout_type_method_1 (tree decl)
+dbxout_type_fn_member (tree decl)
{
+ if (!use_gnu_debug_info_extensions)
+ return;
+
char c1 = 'A', c2;
+ CONTIN;
+ stabstr_I (DECL_NAME (decl));
+ stabstr_S ("::");
+
+ dbxout_type (TREE_TYPE (decl), 0);
+
if (TREE_CODE (TREE_TYPE (decl)) == FUNCTION_TYPE)
c2 = '?';
else /* it's a METHOD_TYPE. */
@@ -1586,72 +1596,7 @@ dbxout_type_method_1 (tree decl)
dbxout_type (DECL_CONTEXT (decl), 0);
stabstr_C (';');
}
-}
-
-/* Subroutine of `dbxout_type'. Output debug info about the methods defined
- in TYPE. */
-
-static void
-dbxout_type_methods (tree type)
-{
- /* C++: put out the method names and their parameter lists */
- tree methods = TYPE_METHODS (type);
- tree fndecl;
- tree last;
-
- if (methods == NULL_TREE)
- return;
-
- if (TREE_CODE (methods) != TREE_VEC)
- fndecl = methods;
- else if (TREE_VEC_ELT (methods, 0) != NULL_TREE)
- fndecl = TREE_VEC_ELT (methods, 0);
- else
- fndecl = TREE_VEC_ELT (methods, 1);
-
- while (fndecl)
- {
- int need_prefix = 1;
-
- /* Group together all the methods for the same operation.
- These differ in the types of the arguments. */
- for (last = NULL_TREE;
- fndecl && (last == NULL_TREE || DECL_NAME (fndecl) == DECL_NAME (last));
- fndecl = DECL_CHAIN (fndecl))
- /* Output the name of the field (after overloading), as
- well as the name of the field before overloading, along
- with its parameter list */
- {
- /* Skip methods that aren't FUNCTION_DECLs. (In C++, these
- include TEMPLATE_DECLs.) The debugger doesn't know what
- to do with such entities anyhow. */
- if (TREE_CODE (fndecl) != FUNCTION_DECL)
- continue;
-
- CONTIN;
-
- last = fndecl;
-
- /* Also ignore abstract methods; those are only interesting to
- the DWARF backends. */
- if (DECL_IGNORED_P (fndecl) || DECL_ABSTRACT_P (fndecl))
- continue;
-
- /* Redundantly output the plain name, since that's what gdb
- expects. */
- if (need_prefix)
- {
- stabstr_I (DECL_NAME (fndecl));
- stabstr_S ("::");
- need_prefix = 0;
- }
-
- dbxout_type (TREE_TYPE (fndecl), 0);
- dbxout_type_method_1 (fndecl);
- }
- if (!need_prefix)
- stabstr_C (';');
- }
+ stabstr_C (';');
}
/* Emit a "range" type specification, which has the form:
@@ -2211,10 +2156,6 @@ dbxout_type (tree type, int full)
/* Write out the field declarations. */
dbxout_type_fields (type);
- if (use_gnu_debug_info_extensions && TYPE_METHODS (type) != NULL_TREE)
- {
- dbxout_type_methods (type);
- }
stabstr_C (';');
===================================================================
@@ -24088,7 +24088,8 @@ gen_member_die (tree type, dw_die_ref co
{
tree member;
tree binfo = TYPE_BINFO (type);
- dw_die_ref child;
+
+ gcc_assert (TYPE_MAIN_VARIANT (type) == type);
/* If this is not an incomplete type, output descriptions of each of its
members. Note that as we output the DIEs necessary to represent the
@@ -24125,13 +24126,16 @@ gen_member_die (tree type, dw_die_ref co
&& (lang_hooks.decls.decl_dwarf_attribute (member, DW_AT_inline)
!= -1));
+ /* Ignore clones. */
+ if (DECL_ABSTRACT_ORIGIN (member))
+ continue;
+
/* If we thought we were generating minimal debug info for TYPE
and then changed our minds, some of the member declarations
may have already been defined. Don't define them again, but
do put them in the right order. */
- child = lookup_decl_die (member);
- if (child)
+ if (dw_die_ref child = lookup_decl_die (member))
{
/* Handle inline static data members, which only have in-class
declarations. */
@@ -24159,6 +24163,7 @@ gen_member_die (tree type, dw_die_ref co
static_inline_p = false;
}
}
+
if (child->die_tag == DW_TAG_variable
&& child->die_parent == comp_unit_die ()
&& ref == NULL)
@@ -24197,23 +24202,6 @@ gen_member_die (tree type, dw_die_ref co
DECL_EXTERNAL (member) = old_extern;
}
}
-
- /* We do not keep type methods in type variants. */
- gcc_assert (TYPE_MAIN_VARIANT (type) == type);
- /* Now output info about the function members (if any). */
- if (TYPE_METHODS (type) != error_mark_node)
- for (member = TYPE_METHODS (type); member; member = DECL_CHAIN (member))
- {
- /* Don't include clones in the member list. */
- if (DECL_ABSTRACT_ORIGIN (member))
- continue;
-
- child = lookup_decl_die (member);
- if (child)
- splice_child_die (context_die, child);
- else
- gen_decl_die (member, NULL, NULL, context_die);
- }
}
/* Generate a DIE for a structure or union type. If TYPE_DECL_SUPPRESS_DEBUG