diff options
| author | Paolo Carlini <paolo.carlini@oracle.com> | 2010-05-11 20:53:36 +0000 |
|---|---|---|
| committer | Paolo Carlini <paolo@gcc.gnu.org> | 2010-05-11 20:53:36 +0000 |
| commit | aac73a6d780c14db68e6b60e2c61e84db45730c0 (patch) | |
| tree | 040db5f6dc7e26684be2b811a89480533f592ff5 /gcc/cp | |
| parent | 9d000e830050e5157a159b531c1f6a564e7fff29 (diff) | |
| download | gcc-aac73a6d780c14db68e6b60e2c61e84db45730c0.zip gcc-aac73a6d780c14db68e6b60e2c61e84db45730c0.tar.gz gcc-aac73a6d780c14db68e6b60e2c61e84db45730c0.tar.bz2 | |
re PR c++/34272 (ICE with invalid template specialization)
/cp
2010-05-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/34272
PR c++/43630
PR c++/34491
* pt.c (process_partial_specialization): Return error_mark_node
in case of unused template parameters in partial specialization.
/testsuite
2010-05-11 Paolo Carlini <paolo.carlini@oracle.com>
PR c++/34272
PR c++/43630
PR c++/34491
* g++.dg/template/crash97.C: New.
* g++.dg/template/crash98.C: Likewise.
* g++.dg/template/crash99.C: Likewise.
* g++.dg/cpp0x/pr31439.C: Adjust.
* g++.dg/template/crash95.C: Likewise.
From-SVN: r159295
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 8 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 9 |
2 files changed, 14 insertions, 3 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 597f8f1..58a57e0 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2010-05-11 Paolo Carlini <paolo.carlini@oracle.com> + + PR c++/34272 + PR c++/43630 + PR c++/34491 + * pt.c (process_partial_specialization): Return error_mark_node + in case of unused template parameters in partial specialization. + 2010-05-11 Jakub Jelinek <jakub@redhat.com> PR c++/44062 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 06f5d9f..1ff1fe2 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -1,6 +1,6 @@ /* Handle parameterized types (templates) for GNU C++. Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000, - 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009 + 2001, 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010 Free Software Foundation, Inc. Written by Ken Raeburn (raeburn@cygnus.com) while at Watchmaker Computing. Rewritten by Jason Merrill (jason@cygnus.com). @@ -3837,7 +3837,7 @@ process_partial_specialization (tree decl) int nargs = TREE_VEC_LENGTH (inner_args); int ntparms; int i; - int did_error_intro = 0; + bool did_error_intro = false; struct template_parm_data tpd; struct template_parm_data tpd2; @@ -3899,12 +3899,15 @@ process_partial_specialization (tree decl) if (!did_error_intro) { error ("template parameters not used in partial specialization:"); - did_error_intro = 1; + did_error_intro = true; } error (" %qD", TREE_VALUE (TREE_VEC_ELT (inner_parms, i))); } + if (did_error_intro) + return error_mark_node; + /* [temp.class.spec] The argument list of the specialization shall not be identical to |