From 6c28362134af5aa01326e4fc3d38753b7fd42eba Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 23 Apr 2015 11:55:11 -0400 Subject: [PATCH] re PR c++/65646 (ICE in invalid syntax) PR c++/65646 * pt.c (check_explicit_specialization): Don't SET_DECL_TEMPLATE_SPECIALIZATION for a variable with no template headers. * decl.c (grokvardecl): Revert earlier fix. From-SVN: r222376 --- gcc/cp/ChangeLog | 8 ++++++++ gcc/cp/decl.c | 4 +--- gcc/cp/pt.c | 2 +- 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 91c389052c6..a463f66c18e 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,11 @@ +2015-04-23 Jason Merrill + + PR c++/65646 + * pt.c (check_explicit_specialization): Don't + SET_DECL_TEMPLATE_SPECIALIZATION for a variable with no template + headers. + * decl.c (grokvardecl): Revert earlier fix. + 2015-04-20 Paolo Carlini PR c++/65801 diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 29d6e73ca31..6ec157912af 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -8210,9 +8210,7 @@ grokvardecl (tree type, DECL_INTERFACE_KNOWN (decl) = 1; // Handle explicit specializations and instantiations of variable templates. - if (orig_declarator - /* For GCC 5 fix 65646 this way. */ - && current_tmpl_spec_kind (template_count) != tsk_none) + if (orig_declarator) decl = check_explicit_specialization (orig_declarator, decl, template_count, 0); diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 91e56a55af9..f9a5c3b70c5 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -2424,7 +2424,7 @@ check_explicit_specialization (tree declarator, switch (tsk) { case tsk_none: - if (processing_specialization) + if (processing_specialization && TREE_CODE (decl) != VAR_DECL) { specialization = 1; SET_DECL_TEMPLATE_SPECIALIZATION (decl); -- 2.30.2