diff options
| author | Jason Merrill <jason@redhat.com> | 2015-12-16 13:22:23 -0500 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2015-12-16 13:22:23 -0500 |
| commit | 4793cbbaa5915165e2392b349c7b227d4e96d552 (patch) | |
| tree | 4b185152df348effcfbb0ca96bba68442df0e01d /gcc | |
| parent | 65016251f649b17274bda3628c02df1cb154220a (diff) | |
| download | gcc-4793cbbaa5915165e2392b349c7b227d4e96d552.zip gcc-4793cbbaa5915165e2392b349c7b227d4e96d552.tar.gz gcc-4793cbbaa5915165e2392b349c7b227d4e96d552.tar.bz2 | |
re PR c++/68309 (ICE: Segmentation fault)
PR c++/68309
* pt.c (instantiate_decl): Revert earlier change.
From-SVN: r231714
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/pt.c | 9 |
2 files changed, 5 insertions, 7 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 7517792..488b2ad 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -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. diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c index 2c2da11..5cf2497 100644 --- a/gcc/cp/pt.c +++ b/gcc/cp/pt.c @@ -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) |