Skip to content

R
riscv-gcc-1
Commit 83afe9b5 by Jason Merrill Committed by Jason Merrill
Options

* semantics.c (finish_if_stmt_cond): Use instantiation_dependent_expression_p. 

From-SVN: r259044
parent 1456e764
Showing with 4 additions and 1 deletions
gcc/cp/ChangeLog
2018-04-03 Jason Merrill <jason@redhat.com> 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. PR c++/85149 - generic lambda and constexpr if.
* pt.c (build_extra_args, add_extra_args): Split from * pt.c (build_extra_args, add_extra_args): Split from
tsubst_pack_expansion. tsubst_pack_expansion.
......
gcc/cp/semantics.c
...@@ -733,7 +733,7 @@ finish_if_stmt_cond (tree cond, tree if_stmt) ...@@ -733,7 +733,7 @@ finish_if_stmt_cond (tree cond, tree if_stmt)
if (IF_STMT_CONSTEXPR_P (if_stmt) if (IF_STMT_CONSTEXPR_P (if_stmt)
&& !type_dependent_expression_p (cond) && !type_dependent_expression_p (cond)
&& require_constant_expression (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 /* Wait until instantiation time, since only then COND has been
converted to bool. */ converted to bool. */
&& TREE_TYPE (cond) == boolean_type_node) && TREE_TYPE (cond) == boolean_type_node)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment