From b80cfdcd48a0e28ff78870197e693acd9b9d2ad2 Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Thu, 4 Dec 2003 05:02:20 +0000 Subject: [PATCH] re PR c++/13179 (ICE w/template parameter in catch specification) PR c++/13179 * semantics.c (finish_handler_parms): Do not call eh_type_info for types used in templates. PR c++/13179 * g++.dg/template/eh1.C: New test. From-SVN: r74269 --- gcc/cp/ChangeLog | 4 ++++ gcc/cp/semantics.c | 2 +- gcc/testsuite/ChangeLog | 3 +++ gcc/testsuite/g++.dg/template/eh1.C | 6 ++++++ 4 files changed, 14 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/g++.dg/template/eh1.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index de5c7142d5b..dbb0d003772 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,9 @@ 2003-12-03 Mark Mitchell + PR c++/13179 + * semantics.c (finish_handler_parms): Do not call eh_type_info for + types used in templates. + PR c++/10771 * parser.c (cp_parser_check_for_invalid_template_id): New function. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index cb259726ee8..a5e93a23567 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -960,7 +960,7 @@ finish_handler_parms (tree decl, tree handler) type = expand_start_catch_block (decl); HANDLER_TYPE (handler) = type; - if (type) + if (!processing_template_decl && type) mark_used (eh_type_info (type)); } diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 2a30f30ccc3..09e058d6e24 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -4,6 +4,9 @@ 2003-12-03 Mark Mitchell + PR c++/13179 + * g++.dg/template/eh1.C: New test. + PR c++/10771 * g++.dg/template/error5.C: New test. diff --git a/gcc/testsuite/g++.dg/template/eh1.C b/gcc/testsuite/g++.dg/template/eh1.C new file mode 100644 index 00000000000..134a0e7a665 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/eh1.C @@ -0,0 +1,6 @@ +template +void foo() +{ + try {} + catch(T e) {} +} -- 2.30.2