diff options
Diffstat (limited to 'gcc/cp')
| -rw-r--r-- | gcc/cp/ChangeLog | 9 | ||||
| -rw-r--r-- | gcc/cp/constexpr.c | 55 | ||||
| -rw-r--r-- | gcc/cp/init.c | 4 |
3 files changed, 38 insertions, 30 deletions
diff --git a/gcc/cp/ChangeLog b/gcc/cp/ChangeLog index 2c2cdfb0d0c..6c66cc4747a 100644 --- a/gcc/cp/ChangeLog +++ b/gcc/cp/ChangeLog @@ -1,3 +1,12 @@ +2016-01-29 Marek Polacek <polacek@redhat.com> + + PR c++/69509 + PR c++/69516 + * constexpr.c (cxx_eval_array_reference): Give the "array subscript + out of bound" error earlier. + * init.c (build_vec_init): Change NE_EXPR into GT_EXPR. Update the + commentary. + 2016-01-29 Patrick Palka <ppalka@gcc.gnu.org> * name-lookup.c (begin_scope): After reusing a cp_binding_level diff --git a/gcc/cp/constexpr.c b/gcc/cp/constexpr.c index 57595a40026..b0769914d45 100644 --- a/gcc/cp/constexpr.c +++ b/gcc/cp/constexpr.c @@ -1833,6 +1833,19 @@ cxx_eval_array_reference (const constexpr_ctx *ctx, tree t, return t; } + tree nelts = array_type_nelts_top (TREE_TYPE (ary)); + /* For VLAs, the number of elements won't be an integer constant. */ + nelts = cxx_eval_constant_expression (ctx, nelts, false, non_constant_p, + overflow_p); + VERIFY_CONSTANT (nelts); + if (!tree_int_cst_lt (index, nelts)) + { + if (!ctx->quiet) + error ("array subscript out of bound"); + *non_constant_p = true; + return t; + } + bool found; if (TREE_CODE (ary) == CONSTRUCTOR) { @@ -1846,37 +1859,23 @@ cxx_eval_array_reference (const constexpr_ctx *ctx, tree t, if (!found) { - tree nelts = array_type_nelts_top (TREE_TYPE (ary)); - /* For VLAs, the number of elements won't be an integer constant. */ - nelts = cxx_eval_constant_expression (ctx, nelts, false, non_constant_p, - overflow_p); - VERIFY_CONSTANT (nelts); - if (tree_int_cst_lt (index, nelts)) + if (TREE_CODE (ary) == CONSTRUCTOR + && CONSTRUCTOR_NO_IMPLICIT_ZERO (ary)) { - if (TREE_CODE (ary) == CONSTRUCTOR - && CONSTRUCTOR_NO_IMPLICIT_ZERO (ary)) - { - /* 'ary' is part of the aggregate initializer we're currently - building; if there's no initializer for this element yet, - that's an error. */ - if (!ctx->quiet) - error ("accessing uninitialized array element"); - *non_constant_p = true; - return t; - } - - /* If it's within the array bounds but doesn't have an explicit - initializer, it's value-initialized. */ - tree val = build_value_init (elem_type, tf_warning_or_error); - return cxx_eval_constant_expression (ctx, val, - lval, - non_constant_p, overflow_p); + /* 'ary' is part of the aggregate initializer we're currently + building; if there's no initializer for this element yet, + that's an error. */ + if (!ctx->quiet) + error ("accessing uninitialized array element"); + *non_constant_p = true; + return t; } - if (!ctx->quiet) - error ("array subscript out of bound"); - *non_constant_p = true; - return t; + /* If it's within the array bounds but doesn't have an explicit + initializer, it's value-initialized. */ + tree val = build_value_init (elem_type, tf_warning_or_error); + return cxx_eval_constant_expression (ctx, val, lval, non_constant_p, + overflow_p); } if (TREE_CODE (ary) == CONSTRUCTOR) diff --git a/gcc/cp/init.c b/gcc/cp/init.c index 9f7b614a293..976ada84587 100644 --- a/gcc/cp/init.c +++ b/gcc/cp/init.c @@ -4008,7 +4008,7 @@ build_vec_init (tree base, tree maxindex, tree init, && (num_initialized_elts == tree_to_shwi (maxindex) + 1)))) { - /* If the ITERATOR is equal to -1, then we don't have to loop; + /* If the ITERATOR is lesser or equal to -1, then we don't have to loop; we've already initialized all the elements. */ tree for_stmt; tree elt_init; @@ -4016,7 +4016,7 @@ build_vec_init (tree base, tree maxindex, tree init, for_stmt = begin_for_stmt (NULL_TREE, NULL_TREE); finish_for_init_stmt (for_stmt); - finish_for_cond (build2 (NE_EXPR, boolean_type_node, iterator, + finish_for_cond (build2 (GT_EXPR, boolean_type_node, iterator, build_int_cst (TREE_TYPE (iterator), -1)), for_stmt, false); elt_init = cp_build_unary_op (PREDECREMENT_EXPR, iterator, 0, |