diff options
Diffstat (limited to 'gcc/cp/constexpr.c')
| -rw-r--r-- | gcc/cp/constexpr.c | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 8f7b7f3..1ebd647 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -1665,6 +1665,10 @@ cxx_eval_call_expression (const constexpr_ctx *ctx, tree t, entry->result = result; } + /* The result of a constexpr function must be completely initialized. */ + if (TREE_CODE (result) == CONSTRUCTOR) + CONSTRUCTOR_NO_IMPLICIT_ZERO (result) = false; + pop_cx_call_context (); return unshare_constructor (result); } @@ -4483,6 +4487,16 @@ cxx_eval_outermost_constant_expr (tree t, bool allow_non_constant, non_constant_p = true; } + if (TREE_CODE (r) == CONSTRUCTOR + && CONSTRUCTOR_NO_IMPLICIT_ZERO (r)) + { + if (!allow_non_constant) + error ("%qE is not a constant expression because it refers to " + "an incompletely initialized variable", t); + TREE_CONSTANT (r) = false; + non_constant_p = true; + } + /* Technically we should check this for all subexpressions, but that runs into problems with our internal representation of pointer subtraction and the 5.19 rules are still in flux. */ @@ -4781,6 +4795,8 @@ maybe_constant_init (tree t, tree decl) t = TREE_OPERAND (t, 0); if (TREE_CODE (t) == INIT_EXPR) t = TREE_OPERAND (t, 1); + if (TREE_CODE (t) == TARGET_EXPR) + t = TARGET_EXPR_INITIAL (t); if (!potential_nondependent_static_init_expression (t)) /* Don't try to evaluate it. */; else |