diff options
| author | James A. Morrison <phython@gcc.gnu.org> | 2005-08-06 05:18:09 +0000 |
|---|---|---|
| committer | James A. Morrison <phython@gcc.gnu.org> | 2005-08-06 05:18:09 +0000 |
| commit | 099f36ab8c55844ae47def2f3cacaef7d006d441 (patch) | |
| tree | f31bebe66c7da34613432c4f884a5166a885a36e /gcc | |
| parent | a6a09784ee39b0bd6d449cfc9f01772f72bbc6ac (diff) | |
| download | gcc-099f36ab8c55844ae47def2f3cacaef7d006d441.zip gcc-099f36ab8c55844ae47def2f3cacaef7d006d441.tar.gz gcc-099f36ab8c55844ae47def2f3cacaef7d006d441.tar.bz2 | |
re PR debug/22514 (ICE in force_decl_die with invalid code after error)
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.
From-SVN: r102799
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 6 | ||||
| -rw-r--r-- | gcc/cp/name-lookup.c | 4 | ||||
| -rw-r--r-- | gcc/testsuite/ChangeLog | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/parse/pr22514.C | 13 |
4 files changed, 27 insertions, 0 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 6c4108f..574918b 100644 --- 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 --- 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 --- 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 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" } */ |