diff options
| -rw-r--r-- | gcc/cp/call.cc | 2 | ||||
| -rw-r--r-- | gcc/cp/constexpr.cc | 4 | ||||
| -rw-r--r-- | gcc/cp/cp-tree.h | 2 | ||||
| -rw-r--r-- | gcc/cp/pt.cc | 2 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp23/consteval-if2.C | 4 | ||||
| -rw-r--r-- | gcc/testsuite/g++.dg/cpp2a/consteval30.C | 12 |
6 files changed, 19 insertions, 7 deletions
diff --git a/gcc/cp/call.cc b/gcc/cp/call.cc index 23d3fc4..ec6c5d5 100644 --- a/gcc/cp/call.cc +++ b/gcc/cp/call.cc @@ -9939,7 +9939,7 @@ build_over_call (struct z_candidate *cand, int flags, tsubst_flags_t complain) obj_arg = TREE_OPERAND (addr, 0); } } - call = cxx_constant_value (call, obj_arg); + call = cxx_constant_value_sfinae (call, obj_arg, complain); if (obj_arg && !error_operand_p (call)) call = build2 (INIT_EXPR, void_type_node, obj_arg, call); call = convert_from_reference (call); diff --git a/gcc/cp/constexpr.cc b/gcc/cp/constexpr.cc index ce4ef8e..778680b 100644 --- a/gcc/cp/constexpr.cc +++ b/gcc/cp/constexpr.cc @@ -7960,10 +7960,10 @@ cxx_constant_value (tree t, tree decl) /* As above, but respect SFINAE. */ tree -cxx_constant_value_sfinae (tree t, tsubst_flags_t complain) +cxx_constant_value_sfinae (tree t, tree decl, tsubst_flags_t complain) { bool sfinae = !(complain & tf_error); - tree r = cxx_eval_outermost_constant_expr (t, sfinae, true, true); + tree r = cxx_eval_outermost_constant_expr (t, sfinae, true, true, false, decl); if (sfinae && !TREE_CONSTANT (r)) r = error_mark_node; return r; diff --git a/gcc/cp/cp-tree.h b/gcc/cp/cp-tree.h index 1bd7bc6..2f71885 100644 --- a/gcc/cp/cp-tree.h +++ b/gcc/cp/cp-tree.h @@ -8414,7 +8414,7 @@ extern bool require_constant_expression (tree); extern bool require_rvalue_constant_expression (tree); extern bool require_potential_rvalue_constant_expression (tree); extern tree cxx_constant_value (tree, tree = NULL_TREE); -extern tree cxx_constant_value_sfinae (tree, tsubst_flags_t); +extern tree cxx_constant_value_sfinae (tree, tree, tsubst_flags_t); extern void cxx_constant_dtor (tree, tree); extern tree cxx_constant_init (tree, tree = NULL_TREE); extern tree maybe_constant_value (tree, tree = NULL_TREE, bool = false); diff --git a/gcc/cp/pt.cc b/gcc/cp/pt.cc index 715eea2..173bc3a 100644 --- a/gcc/cp/pt.cc +++ b/gcc/cp/pt.cc @@ -19811,7 +19811,7 @@ fold_targs_r (tree targs, tsubst_flags_t complain) && !glvalue_p (elt) && !TREE_CONSTANT (elt)) { - elt = cxx_constant_value_sfinae (elt, complain); + elt = cxx_constant_value_sfinae (elt, NULL_TREE, complain); if (elt == error_mark_node) return false; } diff --git a/gcc/testsuite/g++.dg/cpp23/consteval-if2.C b/gcc/testsuite/g++.dg/cpp23/consteval-if2.C index f7053b9..d1845da 100644 --- a/gcc/testsuite/g++.dg/cpp23/consteval-if2.C +++ b/gcc/testsuite/g++.dg/cpp23/consteval-if2.C @@ -77,11 +77,11 @@ qux (int x) } else { - r += foo (8 * x); // { dg-error "is not a constant expression" } + r += foo (8 * x); // { dg-error "is not a constant expression" "" { xfail *-*-* } } } if ! consteval // { dg-warning "'if consteval' only available with" "" { target c++20_only } } { - r += foo (32 * x);// { dg-error "is not a constant expression" } + r += foo (32 * x);// { dg-error "is not a constant expression" "" { xfail *-*-* } } } if consteval // { dg-warning "'if consteval' only available with" "" { target c++20_only } } { diff --git a/gcc/testsuite/g++.dg/cpp2a/consteval30.C b/gcc/testsuite/g++.dg/cpp2a/consteval30.C new file mode 100644 index 0000000..035265e --- /dev/null +++ b/gcc/testsuite/g++.dg/cpp2a/consteval30.C @@ -0,0 +1,12 @@ +// Test SFINAE for a non-constant consteval call. +// { dg-do compile { target c++20 } } + +consteval int deref(const int* x) { return *x; } + +template<const int* P, int = deref(P)> // { dg-bogus "null pointer" } +constexpr int f(int) { return 0; } + +template<const int* P> +constexpr int f(...) { return 1; } + +static_assert(f<nullptr>(0) == 1); |