From 11e9773775ae83d26e8e6e39b5198c2c86cdb5b7 Mon Sep 17 00:00:00 2001 From: Volker Reichelt Date: Tue, 22 Mar 2005 15:07:04 +0000 Subject: [PATCH] re PR c++/19980 (ICE on invalid template declaration) PR c++/19980 * decl.c (start_preparsed_function): Robustify. * g++.dg/template/redecl3.C: New test. From-SVN: r96872 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/decl.c | 7 ++++++- gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/template/redecl3.C | 7 +++++++ 4 files changed, 23 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/template/redecl3.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index bb0c547eeb8..73dd59fde70 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2005-03-22 Volker Reichelt + + PR c++/19980 + * decl.c (start_preparsed_function): Robustify. + 2005-03-22 Volker Reichelt PR c++/20499 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 4887080fa30..1c4568da9d2 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -10009,7 +10009,12 @@ start_preparsed_function (tree decl1, tree attrs, int flags) class scope, current_class_type will be NULL_TREE until set above by push_nested_class.) */ if (processing_template_decl) - decl1 = push_template_decl (decl1); + { + /* FIXME: Handle error_mark_node more gracefully. */ + tree newdecl1 = push_template_decl (decl1); + if (newdecl1 != error_mark_node) + decl1 = newdecl1; + } /* We are now in the scope of the function being defined. */ current_function_decl = decl1; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3909d568423..51f81b9f551 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-03-22 Volker Reichelt + + PR c++/19980 + * g++.dg/template/redecl3.C: New test. + 2005-03-22 Volker Reichelt PR c++/20499 diff --git a/gcc/testsuite/g++.dg/template/redecl3.C b/gcc/testsuite/g++.dg/template/redecl3.C new file mode 100644 index 00000000000..029f9e69a5f --- /dev/null +++ b/gcc/testsuite/g++.dg/template/redecl3.C @@ -0,0 +1,7 @@ +// PR c++/19980 +// Origin: Volker Reichelt + +// { dg-do compile } + +int foo; // { dg-error "previous declaration" } +template void foo() {} // { dg-error "redeclared" } -- 2.30.2