Make sure we aren't trying to do a nested instantiation in template context.

	* pt.c (instantiate_decl): Make sure we aren't trying to do a nested
	instantiation in template context.

From-SVN: r260124

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index d175277af2db2d8440841e18bd23602c234283db..02d35cba4ec5f128443955ad0edc96fb3a87f711 100644 (file)
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,5 +1,8 @@
 2018-05-09  Jason Merrill  <jason@redhat.com>
 
+       * pt.c (instantiate_decl): Make sure we aren't trying to do a nested
+       instantiation in template context.
+
        * class.c (vbase_has_user_provided_move_assign): Use
        user_provided_p.
 

diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index e8346d3bf589efa06e551bc2d2d07c0df68bc38f..790d6ea25e9bcf507b0319e16040c99a65ce8e04 100644 (file)
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -23886,6 +23886,7 @@ instantiate_decl (tree d, bool defer_ok, bool expl_inst_class_mem_p)
     push_to_top_level ();
   else
     {
+      gcc_assert (!processing_template_decl);
       push_function_context ();
       cp_unevaluated_operand = 0;
       c_inhibit_evaluation_warnings = 0;