From: Jason Merrill <jason@redhat.com>
Date: Mon, 27 Jul 2015 16:57:21 +0000 (-0400)
Subject: constexpr.c (cxx_eval_call_expression): Don't add this call to the hash table if... 
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=cca444fb00473658e18f52209dc64709af2005b2;p=gcc.git

constexpr.c (cxx_eval_call_expression): Don't add this call to the hash table if !depth_ok.

	* constexpr.c (cxx_eval_call_expression): Don't add this call to
	the hash table if !depth_ok.

From-SVN: r226256
---

diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog
index 2c5fae1274d..78a6af2e0dc 100644
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
@@ -1,3 +1,8 @@
+2015-07-27  Jason Merrill  <jason@redhat.com>
+
+	* constexpr.c (cxx_eval_call_expression): Don't add this call to
+	the hash table if !depth_ok.
+
 2015-07-27  Marek Polacek  <polacek@redhat.com>
 
 	PR c++/66555
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c
index fe962fee003..2799cb75328 100644
--- a/gcc/cp/constexpr.c
+++ b/gcc/cp/constexpr.c
@@ -1289,7 +1289,7 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t,
   tree result = NULL_TREE;
 
   constexpr_call *entry = NULL;
-  if (!non_constant_args)
+  if (depth_ok && !non_constant_args)
     {
       new_call.hash = iterative_hash_template_arg
 	(new_call.bindings, constexpr_fundef_hasher::hash (new_call.fundef));