From 37978db4a756f65b2e787837b273f773ec4aeae7 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 2 Apr 2015 12:43:02 -0400 Subject: re PR c++/65625 (ICE in make_typename_type, at cp/decl.c:3499) PR c++/65625 * decl.c (make_typename_type): Handle seeing a variable template. From-SVN: r221842 --- gcc/cp/decl.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'gcc/cp/decl.c') diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 31b8e0c..c4731ae2 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -3480,9 +3480,9 @@ make_typename_type (tree context, tree name, enum tag_types tag_type, if (TREE_CODE (name) == TEMPLATE_ID_EXPR) { name = TREE_OPERAND (name, 0); - if (TREE_CODE (name) == TEMPLATE_DECL) + if (DECL_TYPE_TEMPLATE_P (name)) name = TREE_OPERAND (fullname, 0) = DECL_NAME (name); - else if (TREE_CODE (name) == OVERLOAD) + if (TREE_CODE (name) != IDENTIFIER_NODE) { if (complain & tf_error) error ("%qD is not a type", name); -- cgit v1.1