OpenE2K/gcc
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

pt.c (tsubst_copy, CONST_DECL): Don't bother tsubsting a function context.

Browse Source 
* pt.c (tsubst_copy, CONST_DECL): Don't bother tsubsting
	a function context.

From-SVN: r18702
This commit is contained in:
Jason Merrill 1998-03-19 02:54:39 +00:00 committed by Jason Merrill
parent 78957a2a8c
commit 0978790f4f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
gcc/cp/ChangeLog
View File

@ -1,5 +1,8 @@
Thu Mar 19 02:27:48 1998 Jason Merrill <jason@yorick.cygnus.com>
* pt.c (tsubst_copy, CONST_DECL): Don't bother tsubsting
a function context.
* decl.c (store_bindings): Use free_binding_vecs.
(pop_from_top_level): Likewise.

8
gcc/cp/pt.c
View File

@ -4421,10 +4421,12 @@ tsubst_copy (t, args, in_decl)
case FIELD_DECL:
if (DECL_CONTEXT (t))
{
tree ctx = tsubst (DECL_CONTEXT (t), args, in_decl);
if (ctx == current_function_decl)
tree ctx;
if (TREE_CODE (DECL_CONTEXT (t)) == FUNCTION_DECL)
return lookup_name (DECL_NAME (t), 0);
else if (ctx != DECL_CONTEXT (t))
ctx = tsubst (DECL_CONTEXT (t), args, in_decl);
if (ctx != DECL_CONTEXT (t))
return lookup_field (ctx, DECL_NAME (t), 0, 0);
}
return t;