diff options
Diffstat (limited to 'gcc/dwarf2out.c')
| -rw-r--r-- | gcc/dwarf2out.c | 27 |
1 files changed, 21 insertions, 6 deletions
diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index 1bc1730..7d82c47 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -5136,6 +5136,7 @@ static void push_decl_scope (tree); static void pop_decl_scope (void); static dw_die_ref scope_die_for (tree, dw_die_ref); static inline int local_scope_p (dw_die_ref); +static inline int class_scope_p (dw_die_ref); static inline int class_or_namespace_scope_p (dw_die_ref); static void add_type_attribute (dw_die_ref, tree, int, int, dw_die_ref); static void add_calling_convention_attribute (dw_die_ref, tree); @@ -12679,18 +12680,26 @@ local_scope_p (dw_die_ref context_die) return 0; } -/* Returns nonzero if CONTEXT_DIE is a class or namespace, for deciding - whether or not to treat a DIE in this context as a declaration. */ +/* Returns nonzero if CONTEXT_DIE is a class. */ static inline int -class_or_namespace_scope_p (dw_die_ref context_die) +class_scope_p (dw_die_ref context_die) { return (context_die && (context_die->die_tag == DW_TAG_structure_type || context_die->die_tag == DW_TAG_class_type || context_die->die_tag == DW_TAG_interface_type - || context_die->die_tag == DW_TAG_union_type - || context_die->die_tag == DW_TAG_namespace)); + || context_die->die_tag == DW_TAG_union_type)); +} + +/* Returns nonzero if CONTEXT_DIE is a class or namespace, for deciding + whether or not to treat a DIE in this context as a declaration. */ + +static inline int +class_or_namespace_scope_p (dw_die_ref context_die) +{ + return (class_scope_p (context_die) + || (context_die && context_die->die_tag == DW_TAG_namespace)); } /* Many forms of DIEs require a "type description" attribute. This @@ -13993,7 +14002,13 @@ gen_variable_die (tree decl, tree origin, dw_die_ref context_die) && old_die->die_parent == context_die) return; - var_die = new_die (DW_TAG_variable, context_die, decl); + /* For static data members, the declaration in the class is supposed + to have DW_TAG_member tag; the specification should still be + DW_TAG_variable referencing the DW_TAG_member DIE. */ + if (declaration && class_scope_p (context_die)) + var_die = new_die (DW_TAG_member, context_die, decl); + else + var_die = new_die (DW_TAG_variable, context_die, decl); origin_die = NULL; if (origin != NULL) |