1 files changed, 4 insertions, 0 deletions
diff --git a/gcc/cp/pt.c b/gcc/cp/pt.c
index b4b9ba9b530..027e04a4df7 100644
--- a/gcc/cp/pt.c
+++ b/gcc/cp/pt.c
@@ -7424,6 +7424,10 @@ tsubst_expr (t, args, complain, in_decl)
 	  {
 	    decl = DECL_STMT_DECL (HANDLER_PARMS (t));
 	    decl = tsubst (decl, args, complain, in_decl);
+	    /* Prevent instantiate_decl from trying to instantiate
+	       this variable.  We've already done all that needs to be
+	       done.  */
+	    DECL_TEMPLATE_INSTANTIATED (decl) = 1;
 	  }
 	else
 	  decl = NULL_TREE;