diff options
| author | Janne Blomqvist <jb@gcc.gnu.org> | 2018-01-22 15:31:08 +0200 |
|---|---|---|
| committer | Janne Blomqvist <jb@gcc.gnu.org> | 2018-01-22 15:31:08 +0200 |
| commit | 6b271a2ec41ac5eb9331a7c5857e3719c9a24ef4 (patch) | |
| tree | f3d3d61b5081f8526d7ce8cd08c24e54cd76f230 /gcc/fortran/simplify.c | |
| parent | 1dba94d42c835094c540e6cbeeaaa3c2e068a624 (diff) | |
| download | gcc-6b271a2ec41ac5eb9331a7c5857e3719c9a24ef4.zip gcc-6b271a2ec41ac5eb9331a7c5857e3719c9a24ef4.tar.gz gcc-6b271a2ec41ac5eb9331a7c5857e3719c9a24ef4.tar.bz2 | |
PR 78534, 83704 Large character lengths
This patch fixes various parts of the code to use a larger type than
int for the character length. Depending on the situation,
HOST_WIDE_INT, size_t, or gfc_charlen_t is appropriate.
Regtested on x86_64-pc-linux-gnu and i686-pc-linux-gnu.
gcc/fortran/ChangeLog:
2018-01-22 Janne Blomqvist <jb@gcc.gnu.org>
PR 78534
PR 83704
* arith.c (gfc_arith_concat): Use size_t for string length.
(gfc_compare_string): Likewise.
(gfc_compare_with_Cstring): Likewise.
* array.c (gfc_resolve_character_array_constructor): Use
HOST_WIDE_INT, gfc_mpz_get_hwi.
* check.c (gfc_check_fe_runtime_error): Use size_t.
* data.c (create_character_initializer): Use HOST_WIDE_INT,
gfc_extract_hwi.
* decl.c (gfc_set_constant_character_len): Use gfc_charlen_t.
(add_init_expr_to_sym): Use HOST_WIDE_INT.
* expr.c (gfc_build_init_expr): Use HOST_WIDE_INT,
gfc_extract_hwi.
(gfc_apply_init): Likewise.
* match.h (gfc_set_constant_character_len): Update prototype.
* primary.c (match_string_constant): Use size_t.
* resolve.c (resolve_ordinary_assign): Use HOST_WIDE_INT,
gfc_mpz_get_hwi.
* simplify.c (init_result_expr): Likewise.
(gfc_simplify_len_trim): Use size_t.
* target-memory.c (gfc_encode_character): Use size_t.
(gfc_target_encode_expr): Use HOST_WIDE_INT, gfc_mpz_get_hwi.
(interpret_array): Use size_t.
(gfc_interpret_character): Likewise.
* target-memory.h (gfc_encode_character): Update prototype.
(gfc_interpret_character): Likewise.
(gfc_target_interpret_expr): Likewise.
* trans-const.c (gfc_build_string_const): Use size_t for length
argument.
(gfc_build_wide_string_const): Likewise.
* trans-const.h (gfc_build_string_const): Likewise.
(gfc_build_wide_string_const): Likewise.
2018-01-22 Janne Blomqvist <jb@gcc.gnu.org>
PR 78534
PR 83704
* gfortran.dg/string_1.f90: Remove printing the length.
From-SVN: r256944
Diffstat (limited to 'gcc/fortran/simplify.c')
| -rw-r--r-- | gcc/fortran/simplify.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index e2c63a5..1f88b5c 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -275,7 +275,7 @@ init_result_expr (gfc_expr *e, int init, gfc_expr *array) else if (e && e->expr_type == EXPR_CONSTANT) { int i = gfc_validate_kind (e->ts.type, e->ts.kind, false); - int length; + HOST_WIDE_INT length; gfc_char_t *string; switch (e->ts.type) @@ -313,14 +313,14 @@ init_result_expr (gfc_expr *e, int init, gfc_expr *array) if (init == INT_MIN) { gfc_expr *len = gfc_simplify_len (array, NULL); - gfc_extract_int (len, &length); + gfc_extract_hwi (len, &length); string = gfc_get_wide_string (length + 1); gfc_wide_memset (string, 0, length); } else if (init == INT_MAX) { gfc_expr *len = gfc_simplify_len (array, NULL); - gfc_extract_int (len, &length); + gfc_extract_hwi (len, &length); string = gfc_get_wide_string (length + 1); gfc_wide_memset (string, 255, length); } @@ -4415,7 +4415,7 @@ gfc_expr * gfc_simplify_len_trim (gfc_expr *e, gfc_expr *kind) { gfc_expr *result; - int count, len, i; + size_t count, len, i; int k = get_kind (BT_INTEGER, kind, "LEN_TRIM", gfc_default_integer_kind); if (k == -1) |