2005-08-05 James A. Morrison <phython@gcc.gnu.org>

        PR c++/22514
        * name-lookup.c (cp_emit_debug_info_for_using): Do nothing if
        sorrycount or errorcount are nonzero.

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

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 6c4108f..574918b 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,9 @@
+2005-08-05  James A. Morrison  <phython@gcc.gnu.org>
+
+       PR c++/22514
+       * name-lookup.c (cp_emit_debug_info_for_using): Do nothing if
+       sorrycount or errorcount are nonzero.
+
 2005-08-05  Mark Mitchell  <mark@codesourcery.com>
 
        * name-lookup.c (pushtag): Remove accidental commit from:

diff --git a/gcc/cp/name-lookup.c b/gcc/cp/name-lookup.c
index 70ecfad..a03b648 100644 (file)
--- a/gcc/cp/name-lookup.c
+++ b/gcc/cp/name-lookup.c
@@ -4949,6 +4949,10 @@ pop_everything (void)
 void
 cp_emit_debug_info_for_using (tree t, tree context)
 {
+  /* Don't try to emit any debug information if we have errors.  */
+  if (sorrycount || errorcount)
+    return;
+
   /* Ignore this FUNCTION_DECL if it refers to a builtin declaration
      of a builtin function.  */
   if (TREE_CODE (t) == FUNCTION_DECL

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 8e512b2..d0fb7f3 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-05  James A. Morrison  <phython@gcc.gnu.org>
+
+       * g++.dg/parse/pr22514.C: New test.
+
 2005-08-05  J"orn Rennecke <joern.rennecke@st.com>
 
        * gcc.dg/intmax_t-1.c: Extend dg-error to cover sh*-*-elf targets.

diff --git a/gcc/testsuite/g++.dg/parse/pr22514.C b/gcc/testsuite/g++.dg/parse/pr22514.C
new file mode 100644 (file)
index 0000000..23dc9b2
--- /dev/null
+++ b/gcc/testsuite/g++.dg/parse/pr22514.C
@@ -0,0 +1,13 @@
+/* { dg-do compile } */
+namespace s
+{
+  template <int> struct _List_base
+  {
+     int _M_impl;
+  };
+  template<int i> struct list : _List_base<i>
+  {
+    using _List_base<i>::_M_impl;
+  }
+}  /* { dg-error "expected unqualified-id before '\}'" } */
+s::list<1> OutputModuleListType;  /* { dg-error "expected" } */