diff options
| author | Harald Anlauf <anlauf@gmx.de> | 2019-02-24 20:03:28 +0000 |
|---|---|---|
| committer | Harald Anlauf <anlauf@gcc.gnu.org> | 2019-02-24 20:03:28 +0000 |
| commit | cdd1793162ce3a8dc1c0d067f1af173eee98da0f (patch) | |
| tree | f8023f584e66c89d7f50649bb609e9124f0aab15 /gcc/fortran/simplify.c | |
| parent | 953e25c44acc2458d854b1442d7775d997aaf187 (diff) | |
| download | gcc-cdd1793162ce3a8dc1c0d067f1af173eee98da0f.zip gcc-cdd1793162ce3a8dc1c0d067f1af173eee98da0f.tar.gz gcc-cdd1793162ce3a8dc1c0d067f1af173eee98da0f.tar.bz2 | |
re PR fortran/89266 (ICE with TRANSFER of len=0 character array constructor)
2019-02-24 Harald Anlauf <anlauf@gmx.de>
PR fortran/89266
PR fortran/88326
* target-memory.c (gfc_element_size): Return false if element size
cannot be determined; element size is returned separately.
(gfc_target_expr_size): Return false if expression size cannot be
determined; expression size is returned separately.
* target-memory.h: Adjust prototypes.
* check.c (gfc_calculate_transfer_sizes): Adjust references to
gfc_target_expr_size, gfc_element_size.
* arith.c (hollerith2representation): Likewise.
* class.c (find_intrinsic_vtab): Likewise.
* simplify.c (gfc_simplify_sizeof): Likewise.
PR fortran/89266
PR fortran/88326
* gfortran.dg/pr89266.f90: New test.
* gfortran.dg/pr88326.f90: New test.
From-SVN: r269177
Diffstat (limited to 'gcc/fortran/simplify.c')
| -rw-r--r-- | gcc/fortran/simplify.c | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 942f2ee..6c1f4bd 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -7383,6 +7383,7 @@ gfc_simplify_sizeof (gfc_expr *x) { gfc_expr *result = NULL; mpz_t array_size; + size_t res_size; if (x->ts.type == BT_CLASS || x->ts.deferred) return NULL; @@ -7398,7 +7399,8 @@ gfc_simplify_sizeof (gfc_expr *x) result = gfc_get_constant_expr (BT_INTEGER, gfc_index_integer_kind, &x->where); - mpz_set_si (result->value.integer, gfc_target_expr_size (x)); + gfc_target_expr_size (x, &res_size); + mpz_set_si (result->value.integer, res_size); return result; } @@ -7412,6 +7414,7 @@ gfc_simplify_storage_size (gfc_expr *x, { gfc_expr *result = NULL; int k; + size_t siz; if (x->ts.type == BT_CLASS || x->ts.deferred) return NULL; @@ -7427,7 +7430,8 @@ gfc_simplify_storage_size (gfc_expr *x, result = gfc_get_constant_expr (BT_INTEGER, k, &x->where); - mpz_set_si (result->value.integer, gfc_element_size (x)); + gfc_element_size (x, &siz); + mpz_set_si (result->value.integer, siz); mpz_mul_ui (result->value.integer, result->value.integer, BITS_PER_UNIT); return range_check (result, "STORAGE_SIZE"); |