From 9f46fa10f6a25fb07bda3f579bcbbfd9eae2fa81 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Fri, 6 Nov 2015 10:33:24 -0500 Subject: [PATCH] pt.c (push_inline_template_parms_recursive): Don't recreate the CONST_DECL. * pt.c (push_inline_template_parms_recursive): Don't recreate the CONST_DECL. From-SVN: r229856 --- gcc/cp/ChangeLog | 5 +++++ gcc/cp/pt.c | 17 ++--------------- 2 files changed, 7 insertions(+), 15 deletions(-) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 910005d985a..fbbb6cb8d0d 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,8 @@ +2015-11-06 Jason Merrill + + * pt.c (push_inline_template_parms_recursive): Don't recreate the + CONST_DECL. + 2015-11-06 Kyrylo Tkachov * init.c (warn_placement_new_too_small): Use %wu format diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 45eda3a6d72..bfea8e20257 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -441,21 +441,8 @@ push_inline_template_parms_recursive (tree parmlist, int levels) break; case PARM_DECL: - { - /* Make a CONST_DECL as is done in process_template_parm. - It is ugly that we recreate this here; the original - version built in process_template_parm is no longer - available. */ - tree decl = build_decl (DECL_SOURCE_LOCATION (parm), - CONST_DECL, DECL_NAME (parm), - TREE_TYPE (parm)); - DECL_ARTIFICIAL (decl) = 1; - TREE_CONSTANT (decl) = 1; - TREE_READONLY (decl) = 1; - DECL_INITIAL (decl) = DECL_INITIAL (parm); - SET_DECL_TEMPLATE_PARM_P (decl); - pushdecl (decl); - } + /* Push the CONST_DECL. */ + pushdecl (TEMPLATE_PARM_DECL (DECL_INITIAL (parm))); break; default: -- 2.30.2