git
/
gcc
mirror of git://gcc.gnu.org/git/gcc.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

dwarf2out.c (class_scope_p): New static inline. 

* dwarf2out.c (class_scope_p): New static inline.
	(class_or_namespace_scope_p): Use it.
	(gen_variable_die): Use DW_TAG_member tag for static data member
	declarations instead of DW_TAG_variable.

	* g++.dg/debug/dwarf2/static-data-member1.C: New test.

From-SVN: r145770
This commit is contained in:
Jakub Jelinek 2009-04-08 22:00:48 +02:00 committed by Jakub Jelinek
parent d27f0ddc1e
commit ce9ba79be2
4 changed files with 45 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
gcc/ChangeLog
View File

@ -1,3 +1,10 @@
2009-04-08 Jakub Jelinek <jakub@redhat.com>
* dwarf2out.c (class_scope_p): New static inline.
(class_or_namespace_scope_p): Use it.
(gen_variable_die): Use DW_TAG_member tag for static data member
declarations instead of DW_TAG_variable.
2009-04-08 Richard Guenther <rguenther@suse.de>
* tree-ssa-sccvn.c (valueize_refs): Do not continue to

29
gcc/dwarf2out.c
View File

@ -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. */
static inline int
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));
}
/* 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 (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));
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)

4
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,7 @@
2009-04-08 Jakub Jelinek <jakub@redhat.com>
* g++.dg/debug/dwarf2/static-data-member1.C: New test.
2009-04-08 Jason Merrill <jason@redhat.com>
PR c++/25185

12
gcc/testsuite/g++.dg/debug/dwarf2/static-data-member1.C Normal file
View File

@ -0,0 +1,12 @@
// { dg-do compile }
// { dg-options "-g -dA -fno-merge-debug-strings" }
struct A
{
static int staticdatamember;
};
int A::staticdatamember = 6;
// { dg-final { scan-assembler "DW_TAG_member\[^\n\r\]*\[\n\r\]*\[^\n\r\]*staticdatamember\[^\n\r\]*DW_AT_name" } }
// { dg-final { scan-assembler "DW_TAG_variable\[^\n\r\]*\[\n\r\]*\[^\n\r\]*DW_AT_specification" } }