diff options
| author | Thomas Koenig <tkoenig@gcc.gnu.org> | 2019-01-15 22:18:55 +0000 |
|---|---|---|
| committer | Thomas Koenig <tkoenig@gcc.gnu.org> | 2019-01-15 22:18:55 +0000 |
| commit | 0335cc372c9849c61b9a5583655820d88ecf829e (patch) | |
| tree | 422262bd5ef07f5e981b8ccb2e3429ce59dd8e15 /gcc/fortran/resolve.c | |
| parent | 6a0c8e77f289a5c2e1b1ad0f2c8a5c5105f599a6 (diff) | |
| download | gcc-0335cc372c9849c61b9a5583655820d88ecf829e.zip gcc-0335cc372c9849c61b9a5583655820d88ecf829e.tar.gz gcc-0335cc372c9849c61b9a5583655820d88ecf829e.tar.bz2 | |
re PR fortran/43072 (unneeded temporary (s=s+f(a)))
2019-01-15 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/43072
* resolve.c (resolve_array_ref): Add equal_length argument; set it
if the length of the substring equals that of the orignal
variable.
(resolve_ref): Remove the substring if it is equal in length to
the original variable, unless it is an EXPR_SUBSTRING).
2019-01-15 Thomas Koenig <tkoenig@gcc.gnu.org>
PR fortran/43072
* gfortran.dg/actual_array_substr_3.f90: New test.
From-SVN: r267953
Diffstat (limited to 'gcc/fortran/resolve.c')
| -rw-r--r-- | gcc/fortran/resolve.c | 28 |
1 files changed, 24 insertions, 4 deletions
diff --git a/gcc/fortran/resolve.c b/gcc/fortran/resolve.c index 7fbfa69..b1c9292 100644 --- a/gcc/fortran/resolve.c +++ b/gcc/fortran/resolve.c @@ -4873,7 +4873,7 @@ resolve_array_ref (gfc_array_ref *ar) static bool -resolve_substring (gfc_ref *ref) +resolve_substring (gfc_ref *ref, bool *equal_length) { int k = gfc_validate_kind (BT_INTEGER, gfc_charlen_int_kind, false); @@ -4944,6 +4944,13 @@ resolve_substring (gfc_ref *ref) &ref->u.ss.end->where); return false; } + /* If the substring has the same length as the original + variable, the reference itself can be deleted. */ + + if (ref->u.ss.length != NULL + && compare_bound (ref->u.ss.end, ref->u.ss.length->length) == CMP_EQ + && compare_bound_int (ref->u.ss.start, 1) == CMP_EQ) + *equal_length = true; } return true; @@ -5037,7 +5044,8 @@ static bool resolve_ref (gfc_expr *expr) { int current_part_dimension, n_components, seen_part_dimension; - gfc_ref *ref; + gfc_ref *ref, **prev; + bool equal_length; for (ref = expr->ref; ref; ref = ref->next) if (ref->type == REF_ARRAY && ref->u.ar.as == NULL) @@ -5046,7 +5054,8 @@ resolve_ref (gfc_expr *expr) break; } - for (ref = expr->ref; ref; ref = ref->next) + + for (ref = expr->ref, prev = &expr->ref; ref; prev = &ref->next, ref = ref->next) switch (ref->type) { case REF_ARRAY: @@ -5059,8 +5068,19 @@ resolve_ref (gfc_expr *expr) break; case REF_SUBSTRING: - if (!resolve_substring (ref)) + equal_length = false; + if (!resolve_substring (ref, &equal_length)) return false; + + if (expr->expr_type != EXPR_SUBSTRING && equal_length) + { + /* Remove the reference and move the charlen, if any. */ + *prev = ref->next; + ref->next = NULL; + expr->ts.u.cl = ref->u.ss.length; + ref->u.ss.length = NULL; + gfc_free_ref_list (ref); + } break; } |