diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2012-04-07 16:38:11 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2012-04-07 16:38:11 +0000 |
| commit | 8144d290d8ce582bbd50601b74dcfa811bae5c1c (patch) | |
| tree | b08aa45c1b30ee9777563511b083ff3029bd0c04 /gcc/fortran/frontend-passes.c | |
| parent | fae61228ca65572ed01a23819be585b742bcfa62 (diff) | |
| download | gcc-8144d290d8ce582bbd50601b74dcfa811bae5c1c.zip gcc-8144d290d8ce582bbd50601b74dcfa811bae5c1c.tar.gz gcc-8144d290d8ce582bbd50601b74dcfa811bae5c1c.tar.bz2 | |
re PR fortran/52893 (Moving functions out of implied DO loops)
2012-04-07 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/52893
* frontend-passes.c: Keep track of wether we are in an implicit
DO loop; do not do function elimination if we are.
2012-04-07 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/52893
* gfortran.dg/function_optimize_11.f90: New test.
From-SVN: r186213
Diffstat (limited to 'gcc/fortran/frontend-passes.c')
| -rw-r--r-- | gcc/fortran/frontend-passes.c | 20 |
1 files changed, 18 insertions, 2 deletions
diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c index a86982f..b20dabb 100644 --- a/gcc/fortran/frontend-passes.c +++ b/gcc/fortran/frontend-passes.c @@ -70,6 +70,10 @@ static int forall_level; static bool in_omp_workshare; +/* Keep track of iterators for array constructors. */ + +static int iterator_level; + /* Entry point - run all passes for a namespace. So far, only an optimization pass is run. */ @@ -179,6 +183,13 @@ cfe_register_funcs (gfc_expr **e, int *walk_subtrees ATTRIBUTE_UNUSED, if (forall_level > 0) return 0; + /* Function elimination inside an iterator could lead to functions which + depend on iterator variables being moved outside. FIXME: We should check + if the functions do indeed depend on the iterator variable. */ + + if (iterator_level > 0) + return 0; + /* If we don't know the shape at compile time, we create an allocatable temporary variable to hold the intermediate result, but only if allocation on assignment is active. */ @@ -581,6 +592,7 @@ optimize_namespace (gfc_namespace *ns) current_ns = ns; forall_level = 0; + iterator_level = 0; in_omp_workshare = false; gfc_code_walker (&ns->code, convert_do_while, dummy_expr_callback, NULL); @@ -1140,9 +1152,13 @@ gfc_expr_walker (gfc_expr **e, walk_expr_fn_t exprfn, void *data) for (c = gfc_constructor_first ((*e)->value.constructor); c; c = gfc_constructor_next (c)) { - WALK_SUBEXPR (c->expr); - if (c->iterator != NULL) + if (c->iterator == NULL) + WALK_SUBEXPR (c->expr); + else { + iterator_level ++; + WALK_SUBEXPR (c->expr); + iterator_level --; WALK_SUBEXPR (c->iterator->var); WALK_SUBEXPR (c->iterator->start); WALK_SUBEXPR (c->iterator->end); |