procyberian/gcc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

pt.c (instantiate_class_template): Set up the DECL_INITIAL of member constants.

Browse source 
* pt.c (instantiate_class_template): Set up the DECL_INITIAL of
	member constants.
g++.ns/template6.C
	* init.c (expand_member_init): Pull out TYPE_MAIN_VARIANT in
	a ctor initializer.
g++.other/typedef6.C

From-SVN: r24875
This commit is contained in:
Jason Merrill 1999-01-26 20:23:36 +00:00 • committed by Jason Merrill
parent 1b528097cd
commit 94c82a77fd
3 changed files with 11 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
gcc/cp/ChangeLog
View file

@ -1,5 +1,11 @@
1999-01-26 Jason Merrill <jason@yorick.cygnus.com>
* pt.c (instantiate_class_template): Set up the DECL_INITIAL of
member constants.
* init.c (expand_member_init): Pull out TYPE_MAIN_VARIANT in
a ctor initializer.
* tree.c (equal_functions): Fix name in prototype.
* decl.c (push_local_binding): Add FLAGS argument.

2
gcc/cp/init.c
View file

@ -898,7 +898,7 @@ expand_member_init (exp, name, init)
if (name && TREE_CODE (name) == TYPE_DECL)
{
basetype = TREE_TYPE (name);
basetype = TYPE_MAIN_VARIANT (TREE_TYPE (name));
name = DECL_NAME (name);
}

4
gcc/cp/pt.c
View file

@ -4748,6 +4748,10 @@ instantiate_class_template (type)
{
pending_statics = perm_tree_cons (NULL_TREE, r, pending_statics);
/* Perhaps we should do more of grokfield here. */
if (DECL_DEFINED_IN_CLASS_P (r))
/* Set up DECL_INITIAL, since tsubst doesn't. */
DECL_INITIAL (r) = tsubst_expr (DECL_INITIAL (t), args,
NULL_TREE);
start_decl_1 (r);
DECL_IN_AGGR_P (r) = 1;
DECL_EXTERNAL (r) = 1;