From: Jason Merrill <jason@redhat.com>
Date: Wed, 16 Dec 2015 18:22:23 +0000 (-0500)
Subject: re PR c++/68309 (ICE: Segmentation fault)
X-Git-Tag: basepoints/gcc-7~2046
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=4793cbbaa5915165e2392b349c7b227d4e96d552;p=thirdparty%2Fgcc.git

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

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

From-SVN: r231714
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 751779244f60..488b2ad0ad01 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 2c2da11488be..5cf2497f79a2 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)