aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDodji Seketeli <dodji@redhat.com>2008-12-08 19:00:46 +0000
committerDodji Seketeli <dodji@redhat.com>2008-12-08 19:00:46 +0000
commit8ba24055f235f88c67fbe5bad308a96b03c438dc (patch)
tree237d9d1f9ab738dc23c0e57dfa81ef5a6e9a60bf
parentccd983e0bbe4234885e54ae372abeaeca4da867d (diff)
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: https://gcc.gnu.org/svn/gcc/trunk@142562 138bc75d-0d04-0410-961f-82ee72b054a4
-rw-r--r--gcc/cp/ChangeLog6
-rw-r--r--gcc/cp/name-lookup.c3
-rw-r--r--gcc/testsuite/ChangeLog5
-rw-r--r--gcc/testsuite/g++.dg/debug/dwarf2/imported-module-2.C18
4 files changed, 31 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 662fe3248fa..7ee8663ea10 100644
--- 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 0da373ce2a6..b5d14b3b39c 100644
--- 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 927999aefab..9e35e522e58 100644
--- 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
index 00000000000..86128975b47
--- /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;
+}
+