diff options
Diffstat (limited to 'gcc/fortran/array.c')
| -rw-r--r-- | gcc/fortran/array.c | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index e1a5f25..7bb5100 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -1237,7 +1237,6 @@ count_elements (gfc_expr *e) static gfc_try extract_element (gfc_expr *e) { - if (e->rank != 0) { /* Something unextractable */ gfc_free_expr (e); @@ -1250,6 +1249,7 @@ extract_element (gfc_expr *e) gfc_free_expr (e); current_expand.extract_count++; + return SUCCESS; } @@ -1495,7 +1495,7 @@ done: FAILURE if not so. */ static gfc_try -constant_element (gfc_expr *e) +is_constant_element (gfc_expr *e) { int rv; @@ -1517,14 +1517,38 @@ gfc_constant_ac (gfc_expr *e) { expand_info expand_save; gfc_try rc; + gfc_constructor * con; + + rc = SUCCESS; - iter_stack = NULL; - expand_save = current_expand; - current_expand.expand_work_function = constant_element; + if (e->value.constructor + && e->value.constructor->expr->expr_type == EXPR_ARRAY + && !e->value.constructor->iterator) + { + /* Expand the constructor. */ + iter_stack = NULL; + expand_save = current_expand; + current_expand.expand_work_function = is_constant_element; - rc = expand_constructor (e->value.constructor); + rc = expand_constructor (e->value.constructor); + + current_expand = expand_save; + } + else + { + /* No need to expand this further. */ + for (con = e->value.constructor; con; con = con->next) + { + if (con->expr->expr_type == EXPR_CONSTANT) + continue; + else + { + if (!gfc_is_constant_expr (con->expr)) + rc = FAILURE; + } + } + } - current_expand = expand_save; if (rc == FAILURE) return 0; |