diff options
Diffstat (limited to 'gcc/fortran/trans-array.c')
| -rw-r--r-- | gcc/fortran/trans-array.c | 33 |
1 files changed, 31 insertions, 2 deletions
diff --git a/gcc/fortran/trans-array.c b/gcc/fortran/trans-array.c index fe8d13c..0157e62 100644 --- a/gcc/fortran/trans-array.c +++ b/gcc/fortran/trans-array.c @@ -2939,6 +2939,13 @@ gfc_array_init_size (tree descriptor, int rank, tree * poffset, tree size; tree offset; tree stride; + tree cond; + tree or_expr; + tree thencase; + tree elsecase; + tree var; + stmtblock_t thenblock; + stmtblock_t elseblock; gfc_expr *ubound; gfc_se se; int n; @@ -2952,6 +2959,8 @@ gfc_array_init_size (tree descriptor, int rank, tree * poffset, tmp = gfc_conv_descriptor_dtype (descriptor); gfc_add_modify_expr (pblock, tmp, gfc_get_dtype (TREE_TYPE (descriptor))); + or_expr = NULL_TREE; + for (n = 0; n < rank; n++) { /* We have 3 possibilities for determining the size of the array: @@ -3005,6 +3014,14 @@ gfc_array_init_size (tree descriptor, int rank, tree * poffset, /* Calculate the size of this dimension. */ size = fold_build2 (PLUS_EXPR, gfc_array_index_type, se.expr, size); + /* Check wether the size for this dimension is negative. */ + cond = fold_build2 (LE_EXPR, boolean_type_node, size, + gfc_index_zero_node); + if (n == 0) + or_expr = cond; + else + or_expr = fold_build2 (TRUTH_OR_EXPR, boolean_type_node, or_expr, cond); + /* Multiply the stride by the number of elements in this dimension. */ stride = fold_build2 (MULT_EXPR, gfc_array_index_type, stride, size); stride = gfc_evaluate_now (stride, pblock); @@ -3021,8 +3038,20 @@ gfc_array_init_size (tree descriptor, int rank, tree * poffset, *poffset = offset; } - size = gfc_evaluate_now (size, pblock); - return size; + var = gfc_create_var (TREE_TYPE (size), "size"); + gfc_start_block (&thenblock); + gfc_add_modify_expr (&thenblock, var, gfc_index_zero_node); + thencase = gfc_finish_block (&thenblock); + + gfc_start_block (&elseblock); + gfc_add_modify_expr (&elseblock, var, size); + elsecase = gfc_finish_block (&elseblock); + + tmp = gfc_evaluate_now (or_expr, pblock); + tmp = build3_v (COND_EXPR, tmp, thencase, elsecase); + gfc_add_expr_to_block (pblock, tmp); + + return var; } |