From a0324f7b5a936736a7280638998ff9d726f0349b Mon Sep 17 00:00:00 2001 From: Tobias Burnus Date: Fri, 4 May 2007 09:54:06 +0200 Subject: re PR fortran/25071 (dummy argument larger than actual argument) 2007-05-04 Tobias Burnus PR fortran/25071 * interface.c (compare_actual_formal): Check character length. 2007-05-04 Tobias Burnus PR fortran/25071 * gfortran.dg/char_length_3.f90: New test. * gfortran.dg/char_result_2.f90: Fix test. From-SVN: r124411 --- gcc/fortran/ChangeLog | 7 ++++++- gcc/fortran/interface.c | 28 ++++++++++++++++++++++++++++ 2 files changed, 34 insertions(+), 1 deletion(-) (limited to 'gcc/fortran') diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 66e6158..aa9fb99 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,6 +1,11 @@ +2007-05-04 Tobias Burnus + + PR fortran/25071 + * interface.c (compare_actual_formal): Check character length. + 2007-05-01 Thomas Koenig - PR fortran/31732 + PR fortran/31732 * dependency.c (gfc_full_array_ref_p): If the reference is to a single element, check that the array has a single element and that the correct element is referenced. diff --git a/gcc/fortran/interface.c b/gcc/fortran/interface.c index 1672b1c..22a39b5 100644 --- a/gcc/fortran/interface.c +++ b/gcc/fortran/interface.c @@ -1369,6 +1369,34 @@ compare_actual_formal (gfc_actual_arglist **ap, gfc_formal_arglist *formal, return 0; } + if (a->expr->ts.type == BT_CHARACTER + && a->expr->ts.cl && a->expr->ts.cl->length + && a->expr->ts.cl->length->expr_type == EXPR_CONSTANT + && f->sym->ts.cl && f->sym->ts.cl && f->sym->ts.cl->length + && f->sym->ts.cl->length->expr_type == EXPR_CONSTANT) + { + if (mpz_cmp (a->expr->ts.cl->length->value.integer, + f->sym->ts.cl->length->value.integer) < 0) + { + if (where) + gfc_error ("Character length of actual argument shorter " + "than of dummy argument '%s' at %L", + f->sym->name, &a->expr->where); + return 0; + } + + if ((f->sym->attr.pointer || f->sym->attr.allocatable) + && (mpz_cmp (a->expr->ts.cl->length->value.integer, + f->sym->ts.cl->length->value.integer) != 0)) + { + if (where) + gfc_error ("Character length mismatch between actual argument " + "and pointer or allocatable dummy argument " + "'%s' at %L", f->sym->name, &a->expr->where); + return 0; + } + } + /* Satisfy 12.4.1.2 by ensuring that a procedure actual argument is provided for a procedure formal argument. */ if (a->expr->ts.type != BT_PROCEDURE -- cgit v1.1