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

PR c++/68309 * pt.c (instantiate_decl): Revert earlier change. From-SVN: r231714

re PR c++/68309 (ICE: Segmentation fault)
PR c++/68309 * pt.c (instantiate_decl): Revert earlier change. From-SVN: r231714
4793cbba · Jason Merrill · Jason Merrill · 65016251 · 4793cbba · 4793cbba
Commit 4793cbba authored Dec 16, 2015 by Jason Merrill Committed by Jason Merrill Dec 16, 2015
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 7 deletions

gcc/cp/ChangeLog
+3 -0

gcc/cp/pt.c
+2 -7

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
 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.

--- 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)