From aac73a6d780c14db68e6b60e2c61e84db45730c0 Mon Sep 17 00:00:00 2001 From: Paolo Carlini Date: Tue, 11 May 2010 20:53:36 +0000 Subject: [PATCH] re PR c++/34272 (ICE with invalid template specialization) /cp 2010-05-11 Paolo Carlini 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 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 --- gcc/cp/ChangeLog | 8 ++++++++ gcc/cp/pt.c | 9 ++++++--- gcc/testsuite/ChangeLog | 11 +++++++++++ gcc/testsuite/g++.dg/cpp0x/pr31439.C | 4 ++-- gcc/testsuite/g++.dg/template/crash95.C | 2 +- gcc/testsuite/g++.dg/template/crash97.C | 14 ++++++++++++++ gcc/testsuite/g++.dg/template/crash98.C | 14 ++++++++++++++ gcc/testsuite/g++.dg/template/crash99.C | 10 ++++++++++ 8 files changed, 66 insertions(+), 6 deletions(-) create mode 100644 gcc/testsuite/g++.dg/template/crash97.C create mode 100644 gcc/testsuite/g++.dg/template/crash98.C create mode 100644 gcc/testsuite/g++.dg/template/crash99.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 597f8f1bcf9..58a57e05e51 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2010-05-11 Paolo Carlini + + 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 PR c++/44062 diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 06f5d9f2313..1ff1fe2b577 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 diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index ee0fab84ca2..11d07465150 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,14 @@ +2010-05-11 Paolo Carlini + + 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. + 2010-05-11 Jakub Jelinek PR middle-end/44071 diff --git a/gcc/testsuite/g++.dg/cpp0x/pr31439.C b/gcc/testsuite/g++.dg/cpp0x/pr31439.C index 420dc082f08..9d22b56c2f8 100644 --- a/gcc/testsuite/g++.dg/cpp0x/pr31439.C +++ b/gcc/testsuite/g++.dg/cpp0x/pr31439.C @@ -1,8 +1,8 @@ // { dg-options "-std=c++0x" } -template struct A; +template struct A; // { dg-error "declaration" } template struct A<> {}; // { dg-error "not used in partial specialization|anonymous" } -template struct A : A {}; +template struct A : A {}; // { dg-error "incomplete type" } A a; diff --git a/gcc/testsuite/g++.dg/template/crash95.C b/gcc/testsuite/g++.dg/template/crash95.C index 959a9d066ac..2ad9e981666 100644 --- a/gcc/testsuite/g++.dg/template/crash95.C +++ b/gcc/testsuite/g++.dg/template/crash95.C @@ -8,4 +8,4 @@ template < typename > struct S }; }; -S < int > s(0); +S < int > s(0); // { dg-error "incomplete type" } diff --git a/gcc/testsuite/g++.dg/template/crash97.C b/gcc/testsuite/g++.dg/template/crash97.C new file mode 100644 index 00000000000..3d177f4e534 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/crash97.C @@ -0,0 +1,14 @@ +// PR c++/34272 + +template struct A {}; + +template struct A // { dg-error "not used|template\\-parameter" } +{ + template void foo(); +}; + +void bar() +{ + A a; // { dg-error "incomplete type" } + a.foo<0>(); // { dg-error "expected" } +} diff --git a/gcc/testsuite/g++.dg/template/crash98.C b/gcc/testsuite/g++.dg/template/crash98.C new file mode 100644 index 00000000000..e3c224df1d9 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/crash98.C @@ -0,0 +1,14 @@ +// PR c++/43630 + +template < typename > struct A; // { dg-error "declaration" } + +template < typename > struct A < int > // { dg-error "not used|template\\-parameter" } +{ + int i; + int f (); +}; + +int A < int >::f () // { dg-error "incomplete type" } +{ + return i; +} diff --git a/gcc/testsuite/g++.dg/template/crash99.C b/gcc/testsuite/g++.dg/template/crash99.C new file mode 100644 index 00000000000..606d3e3049b --- /dev/null +++ b/gcc/testsuite/g++.dg/template/crash99.C @@ -0,0 +1,10 @@ +// PR c++/34491 + +template struct A; + +template<0> struct A // { dg-error "expected|template|anonymous" } +{ + static const int i = 0; +}; + +int n = A::i; // { dg-error "incomplete type" } -- 2.30.2