From aa005ede28ab74ce037e99ed7861e513d151bc0d Mon Sep 17 00:00:00 2001 From: paolo Date: Thu, 30 Jan 2014 14:28:55 +0000 Subject: [PATCH] /cp 2014-01-30 Paolo Carlini PR c++/58649 * pt.c (lookup_template_class_1): Check start_enum return value for error_mark_node. /testsuite 2014-01-30 Paolo Carlini PR c++/58649 * g++.dg/template/crash117.C: New. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@207304 138bc75d-0d04-0410-961f-82ee72b054a4 --- gcc/cp/ChangeLog | 6 ++++++ gcc/cp/pt.c | 3 +++ gcc/testsuite/ChangeLog | 5 +++++ gcc/testsuite/g++.dg/template/crash117.C | 9 +++++++++ 4 files changed, 23 insertions(+) create mode 100644 gcc/testsuite/g++.dg/template/crash117.C diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7f91128..ff696e3 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,11 @@ 2014-01-30 Paolo Carlini + PR c++/58649 + * pt.c (lookup_template_class_1): Check start_enum return value + for error_mark_node. + +2014-01-30 Paolo Carlini + * decl.c (duplicate_decls, typename_hash, typename_compare): Use TYPE_IDENTIFIER. * error.c (dump_type): Likewise. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index c9c6b37..4a5b6cc 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -7521,6 +7521,9 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context, tsubst (ENUM_UNDERLYING_TYPE (template_type), arglist, complain, in_decl), SCOPED_ENUM_P (template_type), NULL); + + if (t == error_mark_node) + return t; } else { diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 77953e9..ce37ff1 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2014-01-30 Paolo Carlini + + PR c++/58649 + * g++.dg/template/crash117.C: New. + 2014-01-30 Richard Biener PR c/59905 diff --git a/gcc/testsuite/g++.dg/template/crash117.C b/gcc/testsuite/g++.dg/template/crash117.C new file mode 100644 index 0000000..5aaaf73 --- /dev/null +++ b/gcc/testsuite/g++.dg/template/crash117.C @@ -0,0 +1,9 @@ +// PR c++/58649 + +template void foo() +{ + E(); // { dg-error "declaration|declared" } + enum E {}; +} + +template void foo(); -- 2.7.4