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

re PR c++/68309 (ICE: Segmentation fault)

Browse source 
PR c++/68309
	* pt.c (instantiate_decl): Revert earlier change.

From-SVN: r231714
This commit is contained in:
Jason Merrill 2015-12-16 13:22:23 -05:00 • committed by Jason Merrill
parent 65016251f6
commit 4793cbbaa5
2 changed files with 5 additions and 7 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 @@
2015-12-16 Jason Merrill <jason@redhat.com>
PR c++/68309
* pt.c (instantiate_decl): Revert earlier change.
PR c++/63628
* pt.c (tsubst_pack_expansion): Also make dummy decls if
retrieve_local_specialization fails.

9
gcc/cp/pt.c
View file

@ -21742,13 +21742,8 @@ instantiate_decl (tree d, int defer_ok,
template from within the body of another. */
saved_local_specializations = local_specializations;
/* Set up the list of local specializations, copying the current
list if there is one. */
if (local_specializations)
local_specializations
= new hash_map<tree, tree> (*local_specializations);
else
local_specializations = new hash_map<tree, tree>;
/* Set up the list of local specializations. */
local_specializations = new hash_map<tree, tree>;
/* Set up context. */
if (DECL_OMP_DECLARE_REDUCTION_P (code_pattern)