gcc/cp/ChangeLog:

2008-12-07  Dodji Seketeli  <dodji@redhat.com>

        PR debug/38390
        * name-lookup.c (kept_level_p): Don't forget the case of levels
          having using directives.

gcc/testsuite/ChangeLog:
2008-12-07  Dodji Seketeli  <dodji@redhat.com>

        PR debug/38390
        * g++.dg/debug/dwarf2/imported-module-2.C: New test.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@142562 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 662fe32..7ee8663 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2008-12-08  Dodji Seketeli  <dodji@redhat.com>
+
+       PR debug/38390
+       * name-lookup.c (kept_level_p): Don't forget the case of levels
+         having using directives.
+
 2008-12-08  Richard Henderson  <rth@redhat.com>
 
        PR 38240

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 0da373c..b5d14b3 100644 (file)
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -1548,7 +1548,8 @@ kept_level_p (void)
   return (current_binding_level->blocks != NULL_TREE
          || current_binding_level->keep
          || current_binding_level->kind == sk_cleanup
-         || current_binding_level->names != NULL_TREE);
+         || current_binding_level->names != NULL_TREE
+         || current_binding_level->using_directives);
 }
 
 /* Returns the kind of the innermost scope.  */

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 927999a..9e35e52 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2008-12-08  Dodji Seketeli  <dodji@redhat.com>
+
+       PR debug/38390
+       * g++.dg/debug/dwarf2/imported-module-2.C: New test.
+
 2008-12-08  Steve Ellcey  <sje@cup.hp.com>
 
        *  g++.dg/other/packed1.C: Remove ia64-hp-hpux* XFAIL.

diff --git a/gcc/testsuite/g++.dg/debug/dwarf2/imported-module-2.C b/gcc/testsuite/g++.dg/debug/dwarf2/imported-module-2.C
new file mode 100644 (file)
index 0000000..8612897
--- /dev/null
+++ b/gcc/testsuite/g++.dg/debug/dwarf2/imported-module-2.C
@@ -0,0 +1,18 @@
+// Contributed by Dodji Seketeli <dodji@redhat.com>
+// Origin: PR debug/38390
+// { dg-do compile  }
+// { dg-options "-g -dA" }
+// { dg-final { scan-assembler "DW_TAG_imported" }  }
+
+namespace A
+{
+  int v;
+}
+
+int
+f ()
+{
+  using namespace A;
+  return v;
+}
+