From 5d7b4c6fe9b1d69417c0c2e8f618603d2d93b2d3 Mon Sep 17 00:00:00 2001 From: Jason Merrill Date: Thu, 10 May 2018 14:40:55 -0400 Subject: [PATCH] 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 --- gcc/cp/ChangeLog | 3 +++ gcc/cp/pt.c | 1 + 2 files changed, 4 insertions(+) diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index d175277af2d..02d35cba4ec 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2018-05-09 Jason Merrill + * 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 e8346d3bf58..790d6ea25e9 100644 --- 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; -- 2.30.2