From: tkoenig Date: Tue, 1 Aug 2017 19:09:02 +0000 (+0000) Subject: 2017-08-01 Thomas König X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=ea86d96d388ffe07d24d2199ee91f987f22be003;p=thirdparty%2Fgcc.git 2017-08-01 Thomas König PR fortran/79312 * intrisic.c (gfc_convert_type_warn): Only set typespec for empty array constructors which don't have it already. 2017-08-01 Thomas König PR fortran/79312 * gfortran.dg/logical_assignment_1.f90: New test. git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@250792 138bc75d-0d04-0410-961f-82ee72b054a4 --- diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index bd9ecc348f44..7c10d8c59f3c 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,9 @@ +2017-08-01 Thomas König + + PR fortran/79312 + * intrisic.c (gfc_convert_type_warn): Only set typespec for + empty array constructors which don't have it already. + 2017-08-01 Thomas Koenig PR fortran/45435 diff --git a/gcc/fortran/intrinsic.c b/gcc/fortran/intrinsic.c index 2f60fe8c8772..8965d509882b 100644 --- a/gcc/fortran/intrinsic.c +++ b/gcc/fortran/intrinsic.c @@ -4919,9 +4919,11 @@ gfc_convert_type_warn (gfc_expr *expr, gfc_typespec *ts, int eflag, int wflag) if (ts->type == BT_UNKNOWN) goto bad; - /* NULL and zero size arrays get their type here. */ - if (expr->expr_type == EXPR_NULL - || (expr->expr_type == EXPR_ARRAY && expr->value.constructor == NULL)) + /* NULL and zero size arrays get their type here, unless they already have a + typespec. */ + if ((expr->expr_type == EXPR_NULL + || (expr->expr_type == EXPR_ARRAY && expr->value.constructor == NULL)) + && expr->ts.type == BT_UNKNOWN) { /* Sometimes the RHS acquire the type. */ expr->ts = *ts; diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 53081a7c3304..3ba6bb980706 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,8 @@ +2017-08-01 Thomas König + + PR fortran/79312 + * gfortran.dg/logical_assignment_1.f90: New test. + 2017-08-01 Martin Liska PR middle-end/70140 diff --git a/gcc/testsuite/gfortran.dg/logical_assignment_1.f90 b/gcc/testsuite/gfortran.dg/logical_assignment_1.f90 new file mode 100644 index 000000000000..c22898051183 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/logical_assignment_1.f90 @@ -0,0 +1,10 @@ +! { dg-do compile } +! PR 79312 - assigning a logical value to a real +! is invalid. +! Test case by John Harper. +program emptyarray5 + implicit none + real a(0) + a = [logical::] ! { dg-error "Can't convert LOGICAL" } + print *,size(a) +end program emptyarray5