c++: Don't add enums to class's decl_list

We don't need to add CONST_DECLs to a template decl's decl list.  Also made the
code flow a bit clearer.

	gcc/cp/
	* class.c (maybe_add_class_template_decl_list): Don't add CONST_DECLs.
This commit is contained in:
Nathan Sidwell 2020-07-22 08:38:58 -07:00
parent 7be9b276b4
commit 6e1e0decc9
1 changed files with 8 additions and 5 deletions

View File

@ -3049,11 +3049,14 @@ finish_struct_anon (tree t)
void
maybe_add_class_template_decl_list (tree type, tree t, int friend_p)
{
/* Save some memory by not creating TREE_LIST if TYPE is not template. */
if (CLASSTYPE_TEMPLATE_INFO (type))
CLASSTYPE_DECL_LIST (type)
= tree_cons (friend_p ? NULL_TREE : type,
t, CLASSTYPE_DECL_LIST (type));
if (CLASSTYPE_TEMPLATE_INFO (type)
&& TREE_CODE (t) != CONST_DECL)
{
tree purpose = friend_p ? NULL_TREE : type;
CLASSTYPE_DECL_LIST (type)
= tree_cons (purpose, t, CLASSTYPE_DECL_LIST (type));
}
}
/* This function is called from declare_virt_assop_and_dtor via