diff options
| author | Jason Merrill <jason@redhat.com> | 2015-07-27 12:57:21 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2015-07-27 12:57:21 -0400 |
| commit | cca444fb00473658e18f52209dc64709af2005b2 (patch) | |
| tree | 16e6fbeed82adced3c4b22002b99ac3805443142 /gcc | |
| parent | ad497dbb3e52e21c2d5bfcc691a6b26ffba7ccc9 (diff) | |
| download | gcc-cca444fb00473658e18f52209dc64709af2005b2.zip gcc-cca444fb00473658e18f52209dc64709af2005b2.tar.gz gcc-cca444fb00473658e18f52209dc64709af2005b2.tar.bz2 | |
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
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 5 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 2 |
2 files changed, 6 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2c5fae1..78a6af2 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 fe962fe..2799cb7 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)); |