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
This commit is contained in:
parent
75d86b7d38
commit
9f46fa10f6
2 changed files with 7 additions and 15 deletions
|
@ -1,3 +1,8 @@
|
|||
2015-11-06 Jason Merrill <jason@redhat.com>
|
||||
|
||||
* pt.c (push_inline_template_parms_recursive): Don't recreate the
|
||||
CONST_DECL.
|
||||
|
||||
2015-11-06 Kyrylo Tkachov <kyrylo.tkachov@arm.com>
|
||||
|
||||
* init.c (warn_placement_new_too_small): Use %wu format
|
||||
|
|
17
gcc/cp/pt.c
17
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:
|
||||
|
|
Loading…
Add table
Reference in a new issue