diff options
| author | Jason Merrill <jason@redhat.com> | 2018-04-03 13:41:17 -0400 |
|---|---|---|
| committer | Jason Merrill <jason@gcc.gnu.org> | 2018-04-03 13:41:17 -0400 |
| commit | 83afe9b528896ba26d774839c930098f4833cb87 (patch) | |
| tree | 5450ba70cd208e2464b9131fd7662e06e80993d5 /gcc | |
| parent | 1456e764105702a0bb6c9be13d8eef7f21990a79 (diff) | |
| download | gcc-83afe9b528896ba26d774839c930098f4833cb87.zip gcc-83afe9b528896ba26d774839c930098f4833cb87.tar.gz gcc-83afe9b528896ba26d774839c930098f4833cb87.tar.bz2 | |
* semantics.c (finish_if_stmt_cond): Use instantiation_dependent_expression_p.
From-SVN: r259044
Diffstat (limited to 'gcc')
| -rw-r--r-- | gcc/cp/ChangeLog | 3 | ||||
| -rw-r--r-- | gcc/cp/semantics.c | 2 |
2 files changed, 4 insertions, 1 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 9dbb215..8759dc2 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,5 +1,8 @@ 2018-04-03 Jason Merrill <jason@redhat.com> + * semantics.c (finish_if_stmt_cond): Use + instantiation_dependent_expression_p. + PR c++/85149 - generic lambda and constexpr if. * pt.c (build_extra_args, add_extra_args): Split from tsubst_pack_expansion. diff --git a/gcc/cp/semantics.c b/gcc/cp/semantics.c index eef9e2f..ef243f6 100644 --- a/gcc/cp/semantics.c +++ b/gcc/cp/semantics.c @@ -733,7 +733,7 @@ finish_if_stmt_cond (tree cond, tree if_stmt) if (IF_STMT_CONSTEXPR_P (if_stmt) && !type_dependent_expression_p (cond) && require_constant_expression (cond) - && !value_dependent_expression_p (cond) + && !instantiation_dependent_expression_p (cond) /* Wait until instantiation time, since only then COND has been converted to bool. */ && TREE_TYPE (cond) == boolean_type_node) |