From 106dbde4b6239ffcffe1c480780921b0387e858a Mon Sep 17 00:00:00 2001 From: Daniel Franke Date: Tue, 18 Dec 2007 18:39:56 -0500 Subject: re PR fortran/34495 (accepts invalid initialization expressions withTRANSFER) gcc/fortran: 2007-12-19 Daniel Franke PR fortran/34495 * expr.c (check_init_expr): Check whether variables with flavor FL_PARAMETER do have a value assigned. Added error messages where appropriate. * simplify.c (gfc_simplify_transfer): Added check if the MOLD argument is a constant if working with initialization expressions. gcc/testsuite: 2007-12-19 Daniel Franke PR fortran/34495 * gfortran.dg/transfer_simplify_2.f90: Fixed invalid initialization expressions. * gfortran.dg/transfer_simplify_7.f90: New test. From-SVN: r131047 --- gcc/fortran/ChangeLog | 10 ++++++++++ gcc/fortran/expr.c | 19 ++++++++++++++++++- gcc/fortran/simplify.c | 1 + 3 files changed, 29 insertions(+), 1 deletion(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index fe8f609..56585cf 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,13 @@ +2007-12-19 Daniel Franke + + PR fortran/34495 + * expr.c (check_init_expr): Check whether variables with flavor + FL_PARAMETER do have a value assigned. Added error messages where + appropriate. + * simplify.c (gfc_simplify_transfer): Added check if the MOLD + argument is a constant if working with initialization + expressions. + 2007-12-17 Tobias Burnus * intrinsic.c (add_functions): Undo change; mark float and diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 92ad77e..4e77605 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -2202,7 +2202,18 @@ check_init_expr (gfc_expr *e) if (e->symtree->n.sym->attr.flavor == FL_PARAMETER) { - t = simplify_parameter_variable (e, 0); + /* A PARAMETER shall not be used to define itself, i.e. + REAL, PARAMETER :: x = transfer(0, x) + is invalid. */ + if (!e->symtree->n.sym->value) + { + gfc_error("PARAMETER '%s' is used at %L before its definition " + "is complete", e->symtree->n.sym->name, &e->where); + t = FAILURE; + } + else + t = simplify_parameter_variable (e, 0); + break; } @@ -2233,6 +2244,12 @@ check_init_expr (gfc_expr *e) e->symtree->n.sym->name, &e->where); break; + case AS_EXPLICIT: + gfc_error ("Array '%s' at %L is a variable, which does " + "not reduce to a constant expression", + e->symtree->n.sym->name, &e->where); + break; + default: gcc_unreachable(); } diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index ea807d1..abcff3c 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -4088,6 +4088,7 @@ gfc_simplify_transfer (gfc_expr *source, gfc_expr *mold, gfc_expr *size) unsigned char *buffer; if (!gfc_is_constant_expr (source) + || (gfc_init_expr && !gfc_is_constant_expr (mold)) || !gfc_is_constant_expr (size)) return NULL; -- cgit v1.1