diff options
| author | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-06-09 15:39:29 +0000 |
|---|---|---|
| committer | Steven G. Kargl <kargl@gcc.gnu.org> | 2018-06-09 15:39:29 +0000 |
| commit | 4ea0af1da0cfa9c55e739808d4b405b982985ad5 (patch) | |
| tree | 2da10bd03ed520cc2fdf26e97e9d585882077a1b /gcc/fortran/data.c | |
| parent | 598dc594fa743db13fae4a884e33079a06de07e2 (diff) | |
| download | gcc-4ea0af1da0cfa9c55e739808d4b405b982985ad5.zip gcc-4ea0af1da0cfa9c55e739808d4b405b982985ad5.tar.gz gcc-4ea0af1da0cfa9c55e739808d4b405b982985ad5.tar.bz2 | |
re PR fortran/78278 (ICE in gfc_wide_memset, at fortran/scanner.c:153)
2018-06-09 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/78278
* data.c (gfc_assign_data_value): Re-arrange code to allow for
an error for double initialization of CHARACTER entities.
2018-06-09 Steven G. Kargl <kargl@gcc.gnu.org>
PR fortran/78278
* gfortran.dg/data_bounds_1.f90: Add -std=gnu option.
* gfortran.dg/data_char_1.f90: Ditto.
* gfortran.dg/pr78571.f90: Ditto.
* gfortran.dg/pr78278.f90: New test.
From-SVN: r261361
Diffstat (limited to 'gcc/fortran/data.c')
| -rw-r--r-- | gcc/fortran/data.c | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/gcc/fortran/data.c b/gcc/fortran/data.c index d837e15..0d1f830 100644 --- a/gcc/fortran/data.c +++ b/gcc/fortran/data.c @@ -483,6 +483,21 @@ gfc_assign_data_value (gfc_expr *lvalue, gfc_expr *rvalue, mpz_t index, mpz_clear (offset); gcc_assert (repeat == NULL); + /* Overwriting an existing initializer is non-standard but usually only + provokes a warning from other compilers. */ + if (init != NULL && init->where.lb && rvalue->where.lb) + { + /* Order in which the expressions arrive here depends on whether + they are from data statements or F95 style declarations. + Therefore, check which is the most recent. */ + expr = (LOCATION_LINE (init->where.lb->location) + > LOCATION_LINE (rvalue->where.lb->location)) + ? init : rvalue; + if (gfc_notify_std (GFC_STD_GNU, "re-initialization of %qs at %L", + symbol->name, &expr->where) == false) + return false; + } + if (ref || last_ts->type == BT_CHARACTER) { /* An initializer has to be constant. */ @@ -503,22 +518,6 @@ gfc_assign_data_value (gfc_expr *lvalue, gfc_expr *rvalue, mpz_t index, return false; } - /* Overwriting an existing initializer is non-standard but usually only - provokes a warning from other compilers. */ - if (init != NULL) - { - /* Order in which the expressions arrive here depends on whether - they are from data statements or F95 style declarations. - Therefore, check which is the most recent. */ - expr = (LOCATION_LINE (init->where.lb->location) - > LOCATION_LINE (rvalue->where.lb->location)) - ? init : rvalue; - if (gfc_notify_std (GFC_STD_GNU, - "re-initialization of %qs at %L", - symbol->name, &expr->where) == false) - return false; - } - expr = gfc_copy_expr (rvalue); if (!gfc_compare_types (&lvalue->ts, &expr->ts)) gfc_convert_type (expr, &lvalue->ts, 0); |