From 36569397edc59ef5ccefbf4c0d70deff54102afd Mon Sep 17 00:00:00 2001 From: Mark Mitchell Date: Mon, 12 Dec 2005 16:29:44 +0000 Subject: [PATCH] re PR c++/25300 (ICE with g++.dg/template/inherit.C) PR c++/25300 * tree.c (build_qualified_name): Return error_mark_node for erroneous input. PR c++/25300 * g++.dg/template/inherit.C: Do not use a generic error message. From-SVN: r108413 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/tree.c | 4 ++++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/template/inherit.C | 2 +- 4 files changed, 16 insertions(+), 1 deletion(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index b3bad798b3e..700b99241ea 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,9 @@ +2005-12-12 Mark Mitchell + + PR c++/25300 + * tree.c (build_qualified_name): Return error_mark_node for + erroneous input. + 2005-12-10 Mark Mitchell PR c++/25337 diff --git a/gcc/cp/tree.c b/gcc/cp/tree.c index 15ee56c7c87..4340c69e1d3 100644 --- a/gcc/cp/tree.c +++ b/gcc/cp/tree.c @@ -817,6 +817,10 @@ tree build_qualified_name (tree type, tree scope, tree name, bool template_p) { tree t; + if (type == error_mark_node + || scope == error_mark_node + || name == error_mark_node) + return error_mark_node; t = build2 (SCOPE_REF, type, scope, name); QUALIFIED_NAME_IS_TEMPLATE (t) = template_p; return t; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index bdade3ec6f6..6e5aad0f9dc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2005-12-12 Mark Mitchell + + PR c++/25300 + * g++.dg/template/inherit.C: Do not use a generic error message. + 2005-12-12 Andrew Pinski PR libobjc/25354 diff --git a/gcc/testsuite/g++.dg/template/inherit.C b/gcc/testsuite/g++.dg/template/inherit.C index dbff7e145ee..bc20345fa0a 100644 --- a/gcc/testsuite/g++.dg/template/inherit.C +++ b/gcc/testsuite/g++.dg/template/inherit.C @@ -9,5 +9,5 @@ struct Z : X { }; int main() { Z z; - z.X::f(); // { dg-error ".*" "" } + z.X::f(); // { dg-error "template parameters" "" } } -- 2.30.2