From d5cfbd6e825ae100a1549d79a91cdfdc0156195a Mon Sep 17 00:00:00 2001 From: "Steven G. Kargl" Date: Tue, 22 Oct 2019 18:38:30 +0000 Subject: [PATCH] re PR fortran/92174 (runtime error: index 15 out of bounds for type 'gfc_expr *[15]) 2019-10-22 Steven G. Kargl PR fortran/92174 * decl.c (attr_decl1): Move check for F2018:C822 from here ... * array.c (gfc_set_array_spec): ... to here. From-SVN: r277298 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/array.c | 14 ++++++++++++++ gcc/fortran/decl.c | 8 -------- 3 files changed, 20 insertions(+), 8 deletions(-) diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 6c23d995ef85..4113fc897510 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2019-10-22 Steven G. Kargl + + PR fortran/92174 + * decl.c (attr_decl1): Move check for F2018:C822 from here ... + * array.c (gfc_set_array_spec): ... to here. + 2019-10-18 Steven G. Kargl PR fortran/69455 diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c index c1342c7c8448..6d20cbb9d365 100644 --- a/gcc/fortran/array.c +++ b/gcc/fortran/array.c @@ -843,6 +843,10 @@ gfc_set_array_spec (gfc_symbol *sym, gfc_array_spec *as, locus *error_loc) sym->as->cotype = as->cotype; sym->as->corank = as->corank; + /* Check F2018:C822. */ + if (sym->as->rank + sym->as->corank > GFC_MAX_DIMENSIONS) + goto too_many; + for (i = 0; i < as->corank; i++) { sym->as->lower[sym->as->rank + i] = as->lower[i]; @@ -861,6 +865,10 @@ gfc_set_array_spec (gfc_symbol *sym, gfc_array_spec *as, locus *error_loc) sym->as->cray_pointee = as->cray_pointee; sym->as->cp_was_assumed = as->cp_was_assumed; + /* Check F2018:C822. */ + if (sym->as->rank + sym->as->corank > GFC_MAX_DIMENSIONS) + goto too_many; + for (i = 0; i < sym->as->corank; i++) { sym->as->lower[as->rank + i] = sym->as->lower[i]; @@ -875,6 +883,12 @@ gfc_set_array_spec (gfc_symbol *sym, gfc_array_spec *as, locus *error_loc) free (as); return true; + +too_many: + + gfc_error ("rank + corank of %qs exceeds %d at %C", sym->name, + GFC_MAX_DIMENSIONS); + return false; } diff --git a/gcc/fortran/decl.c b/gcc/fortran/decl.c index 24002ed1c6e8..52a98cd44ed4 100644 --- a/gcc/fortran/decl.c +++ b/gcc/fortran/decl.c @@ -8490,14 +8490,6 @@ attr_decl1 (void) goto cleanup; } - /* Check F2018:C822. */ - if (sym->attr.dimension && sym->attr.codimension - && sym->as && sym->as->rank + sym->as->corank > 15) - { - gfc_error ("rank + corank of %qs exceeds 15 at %C", sym->name); - return MATCH_ERROR; - } - if (sym->attr.cray_pointee && sym->as != NULL) { /* Fix the array spec. */ -- 2.47.2