From b7d36ea3cc8cc960b98f307bcdb04f66085b9c2b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Fran=C3=A7ois-Xavier=20Coudert?= Date: Mon, 12 May 2008 15:51:27 +0000 Subject: re PR fortran/36176 (TRANSFER of constant substrings) PR fortran/36176 * target-memory.c (gfc_target_expr_size): Correctly treat substrings. (gfc_target_encode_expr): Likewise. (gfc_interpret_complex): Whitespace change. * gfortran.dg/transfer_simplify_9.f90: New test. From-SVN: r135219 --- gcc/fortran/ChangeLog | 8 ++++++++ gcc/fortran/target-memory.c | 38 ++++++++++++++++++++++++++++++++------ 2 files changed, 40 insertions(+), 6 deletions(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index ae78f0e..0556310 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,11 @@ +2008-05-12 Francois-Xavier Coudert + + PR fortran/36176 + * target-memory.c (gfc_target_expr_size): Correctly treat + substrings. + (gfc_target_encode_expr): Likewise. + (gfc_interpret_complex): Whitespace change. + 2008-05-11 Thomas Koenig PR fortran/35719 diff --git a/gcc/fortran/target-memory.c b/gcc/fortran/target-memory.c index 149afa1..389e2a5 100644 --- a/gcc/fortran/target-memory.c +++ b/gcc/fortran/target-memory.c @@ -100,7 +100,16 @@ gfc_target_expr_size (gfc_expr *e) case BT_LOGICAL: return size_logical (e->ts.kind); case BT_CHARACTER: - return size_character (e->value.character.length, e->ts.kind); + if (e->expr_type == EXPR_SUBSTRING && e->ref) + { + int start, end; + + gfc_extract_int (e->ref->u.ss.start, &start); + gfc_extract_int (e->ref->u.ss.end, &end); + return size_character (MAX(end - start + 1, 0), e->ts.kind); + } + else + return size_character (e->value.character.length, e->ts.kind); case BT_HOLLERITH: return e->representation.length; case BT_DERIVED: @@ -231,7 +240,8 @@ gfc_target_encode_expr (gfc_expr *source, unsigned char *buffer, return encode_array (source, buffer, buffer_size); gcc_assert (source->expr_type == EXPR_CONSTANT - || source->expr_type == EXPR_STRUCTURE); + || source->expr_type == EXPR_STRUCTURE + || source->expr_type == EXPR_SUBSTRING); /* If we already have a target-memory representation, we use that rather than recreating one. */ @@ -257,9 +267,24 @@ gfc_target_encode_expr (gfc_expr *source, unsigned char *buffer, return encode_logical (source->ts.kind, source->value.logical, buffer, buffer_size); case BT_CHARACTER: - return encode_character (source->ts.kind, source->value.character.length, - source->value.character.string, buffer, - buffer_size); + if (source->expr_type == EXPR_CONSTANT || source->ref == NULL) + return encode_character (source->ts.kind, + source->value.character.length, + source->value.character.string, buffer, + buffer_size); + else + { + int start, end; + + gcc_assert (source->expr_type == EXPR_SUBSTRING); + gfc_extract_int (source->ref->u.ss.start, &start); + gfc_extract_int (source->ref->u.ss.end, &end); + return encode_character (source->ts.kind, + MAX(end - start + 1, 0), + &source->value.character.string[start-1], + buffer, buffer_size); + } + case BT_DERIVED: return encode_derived (source, buffer, buffer_size); default: @@ -342,7 +367,8 @@ gfc_interpret_complex (int kind, unsigned char *buffer, size_t buffer_size, { int size; size = gfc_interpret_float (kind, &buffer[0], buffer_size, real); - size += gfc_interpret_float (kind, &buffer[size], buffer_size - size, imaginary); + size += gfc_interpret_float (kind, &buffer[size], buffer_size - size, + imaginary); return size; } -- cgit v1.1