diff options
| -rw-r--r-- | gcc/cp/constexpr.c | 7 | ||||
| -rw-r--r-- | gcc/cp/decl.c | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 7c27131..82a597d 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -7696,6 +7696,10 @@ maybe_constant_value (tree t, tree decl, bool manifestly_const_eval) return r; } + /* Don't evaluate an unevaluated operand. */ + if (cp_unevaluated_operand) + return t; + uid_sensitive_constexpr_evaluation_checker c; r = cxx_eval_outermost_constant_expr (t, true, true, false, false, decl); gcc_checking_assert (r == t @@ -7759,6 +7763,9 @@ fold_non_dependent_expr_template (tree t, tsubst_flags_t complain, return t; } + if (cp_unevaluated_operand && !manifestly_const_eval) + return t; + tree r = cxx_eval_outermost_constant_expr (t, true, true, manifestly_const_eval, false, object); diff --git a/gcc/cp/decl.c b/gcc/cp/decl.c index 947bbfc..eed4781 100644 --- a/gcc/cp/decl.c +++ b/gcc/cp/decl.c @@ -11000,7 +11000,7 @@ compute_array_index_type_loc (location_t name_loc, tree name, tree size, cp_convert (ssizetype, integer_one_node, complain), complain); - itype = maybe_constant_value (itype); + itype = maybe_constant_value (itype, NULL_TREE, true); } if (!TREE_CONSTANT (itype)) |