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

re PR c++/53599 (gcc-4.7.1_rc20120606 segfaults compiling boost.karma) 

PR c++/53599
	* pt.c (lookup_template_class_1): Use ts_global.

From-SVN: r188809
This commit is contained in:
Jason Merrill 2012-06-20 03:21:40 -04:00 committed by Jason Merrill
parent 0654a3b95d
commit a885930cfd
3 changed files with 11 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
gcc/cp/ChangeLog
View File

@ -1,3 +1,8 @@
2012-06-19 Jason Merrill <jason@redhat.com>
PR c++/53599
* pt.c (lookup_template_class_1): Use ts_global.
2012-06-14 Richard Guenther <rguenther@suse.de>
Backport from mainline

2
gcc/cp/pt.c
View File

@ -7564,7 +7564,7 @@ lookup_template_class_1 (tree d1, tree arglist, tree in_decl, tree context,
/* A local class. Make sure the decl gets registered properly. */
if (context == current_function_decl)
pushtag (DECL_NAME (gen_tmpl), t, /*tag_scope=*/ts_current);
pushtag (DECL_NAME (gen_tmpl), t, /*tag_scope=*/ts_global);
if (comp_template_args (CLASSTYPE_TI_ARGS (template_type), arglist))
/* This instantiation is another name for the primary

5
gcc/testsuite/ChangeLog
View File

@ -1,3 +1,8 @@
2012-06-19 Jason Merrill <jason@redhat.com>
PR c++/53599
* g++.dg/template/local7.C: New.
2012-06-16 Venkataramanan Kumar <venkataramanan.kumar@amd.com>
Back port from mainline