diff options
| author | Dodji Seketeli <dodji@redhat.com> | 2009-03-23 23:21:38 +0000 |
|---|---|---|
| committer | Jakub Jelinek <jakub@redhat.com> | 2009-03-23 23:21:38 +0000 |
| commit | 9b4502a6424fae31c1a926988229ae8abc3436f0 (patch) | |
| tree | 7a8d60a22a1edb6f354ac45ea5e7a23ab56ddddd | |
| parent | a3edd5fa79b0e72c75a51ee1fa7cf827a5a0aa54 (diff) | |
PR debug/39524
* dwarf2out.c (gen_variable_die): Avoid adding duplicate declaration
nodes.
* g++.dg/debug/dwarf2/imported-decl-1.C: New test.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@145018 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | gcc/ChangeLog | 7 | ||||
| -rw-r--r-- | gcc/dwarf2out.c | 8 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/debug/dwarf2/imported-decl-1.C | 17 |
4 files changed, 38 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog index c1f7e6f0129..a75ca23f1ea 100644 --- a/gcc/ChangeLog +++ b/gcc/ChangeLog @@ -1,3 +1,10 @@ +2009-03-24 Dodji Seketeli <dodji@redhat.com> + Jakub Jelinek <jakub@redhat.com> + + PR debug/39524 + * dwarf2out.c (gen_variable_die): Avoid adding duplicate declaration + nodes. + 2009-03-23 Jakub Jelinek <jakub@redhat.com> PR c/39495 diff --git a/gcc/dwarf2out.c b/gcc/dwarf2out.c index af5c99484bc..9bf0803ce57 100644 --- a/gcc/dwarf2out.c +++ b/gcc/dwarf2out.c @@ -13978,6 +13978,14 @@ gen_variable_die (tree decl, tree origin, dw_die_ref context_die) return; } + /* If the compiler emitted a definition for the DECL declaration + and if we already emitted a DIE for it, don't emit a second + DIE for it again. */ + if (old_die + && declaration + && old_die->die_parent == context_die) + return; + var_die = new_die (DW_TAG_variable, context_die, decl); origin_die = NULL; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index cced718e421..4f869a0e3e3 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2009-03-24 Dodji Seketeli <dodji@redhat.com> + Jakub Jelinek <jakub@redhat.com> + + PR debug/39524 + * g++.dg/debug/dwarf2/imported-decl-1.C: New test. + 2009-03-23 Jakub Jelinek <jakub@redhat.com> PR c/39495 diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/imported-decl-1.C b/gcc/testsuite/g++.dg/debug/dwarf2/imported-decl-1.C new file mode 100644 index 00000000000..bfdb4f8f5a0 --- /dev/null +++ b/gcc/testsuite/g++.dg/debug/dwarf2/imported-decl-1.C @@ -0,0 +1,17 @@ +// PR debug/39524 +// { dg-do compile } +// { dg-options "-gdwarf-2 -dA -O0 -fno-merge-debug-strings" } + +namespace A +{ + static int var2 = 2; +} + +int +func () +{ + using A::var2; + return var2; +} + +// { dg-final { scan-assembler-times "var2\[^\n\r\]*DW_AT_name" 1 } } |