* semantics.c (finish_if_stmt_cond): Use instantiation_dependent_expression_p.

From-SVN: r259044

* semantics.c (finish_if_stmt_cond): Use instantiation_dependent_expression_p.
From-SVN: r259044
83afe9b5 · Jason Merrill · Jason Merrill · 1456e764 · 83afe9b5 · 83afe9b5
Commit 83afe9b5 authored Apr 03, 2018 by Jason Merrill Committed by Jason Merrill Apr 03, 2018
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 1 deletions

gcc/cp/ChangeLog
+3 -0

gcc/cp/semantics.c
+1 -1

No files found.
--- a/gcc/cp/ChangeLog
+++ b/gcc/cp/ChangeLog
 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.

--- 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)