From: tkoenig Date: Sun, 13 Oct 2019 13:42:30 +0000 (+0000) Subject: 2019-10-13 Thomas Koenig X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d1555c81c997938bf95fdd6fd2d8fa725364fc9;p=thirdparty%2Fgcc.git 2019-10-13 Thomas Koenig PR fortran/92017 * expr.c (simplify_parameter_variable): Set the character length of the result expression from the original expression if necessary. 2019-10-13 Thomas Koenig PR fortran/92017 * gfortran.dg/minmaxloc_14.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@276938 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 82164d713aef..52f30dd58f58 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,10 @@ +2019-10-13 Thomas Koenig + + PR fortran/92017 + * expr.c (simplify_parameter_variable): Set the character length + of the result expression from the original expression if + necessary. + 2019-10-11 Steven G. Kargl PR fortran/91649 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index 9f638fe4dc32..c508890d68de 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -2066,6 +2066,9 @@ simplify_parameter_variable (gfc_expr *p, int type) e->rank = p->rank; + if (e->ts.type == BT_CHARACTER && e->ts.u.cl == NULL) + e->ts.u.cl = gfc_new_charlen (gfc_current_ns, p->ts.u.cl); + /* Do not copy subobject refs for constant. */ if (e->expr_type != EXPR_CONSTANT && p->ref != NULL) e->ref = gfc_copy_ref (p->ref); diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3117a07942c9..b914cb8fd42f 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2019-10-13 Thomas Koenig + + PR fortran/92017 + * gfortran.dg/minmaxloc_14.f90: New test. + 2019-10-13 Rainer Orth * lib/target-supports.exp (add_options_for_c99_runtime): Remove. diff --git a/gcc/testsuite/gfortran.dg/minmaxloc_14.f90 b/gcc/testsuite/gfortran.dg/minmaxloc_14.f90 new file mode 100644 index 000000000000..d24d03f0af4c --- /dev/null +++ b/gcc/testsuite/gfortran.dg/minmaxloc_14.f90 @@ -0,0 +1,12 @@ +! { dg-do compile } +! PR 92017 - this used to cause an ICE due do a missing charlen. +! Original test case by Gerhard Steinmetz. + +program p + character(3), parameter :: a(4) = 'abc' + integer, parameter :: b(1) = minloc(a) + integer, parameter :: c = minloc(a, dim=1) + integer, parameter :: bb(1) = maxloc(a) + integer, parameter :: c2 = maxloc(a,dim=1) +end program p +