From 70081fe64a696a1f8e1d68c63d19c38529bbf8e1 Mon Sep 17 00:00:00 2001 From: Thomas Koenig Date: Sat, 2 Feb 2019 17:07:40 +0000 Subject: [PATCH] re PR fortran/88298 (Bogus conversion warning for CSHIFT with -fno-range-check -m64) 2019-02-02 Thomas Koenig PR fortran/88298 Backport from trunk * arith.c (gfc_int2int): Do not warn if src->do_not_warn is set. * gfortran.h (gfc_expr): Add flag do_not_warn. * intrinsic.c (gfc_convert_type_warn): Set expr->do_not_warn if no warning is desired. 2019-02-02 Thomas Koenig PR fortran/88298 Backport from trunk * gfortran.dg/warn_conversion_10.f90: New test. From-SVN: r268479 --- gcc/fortran/ChangeLog | 9 +++++++++ gcc/fortran/arith.c | 2 +- gcc/fortran/gfortran.h | 3 +++ gcc/fortran/intrinsic.c | 2 ++ gcc/testsuite/ChangeLog | 6 ++++++ gcc/testsuite/gfortran.dg/warn_conversion_10.f90 | 8 ++++++++ 6 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 gcc/testsuite/gfortran.dg/warn_conversion_10.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index 62adf03bbd76..704a15269dd7 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,3 +1,12 @@ +2019-02-02 Thomas Koenig + + PR fortran/88298 + Backport from trunk + * arith.c (gfc_int2int): Do not warn if src->do_not_warn is set. + * gfortran.h (gfc_expr): Add flag do_not_warn. + * intrinsic.c (gfc_convert_type_warn): Set expr->do_not_warn if + no warning is desired. + 2019-02-02 Thomas Koenig PR fortran/57048 diff --git a/gcc/fortran/arith.c b/gcc/fortran/arith.c index c594048eb510..895d65f53d4c 100644 --- a/gcc/fortran/arith.c +++ b/gcc/fortran/arith.c @@ -2050,7 +2050,7 @@ gfc_int2int (gfc_expr *src, int kind) gfc_convert_mpz_to_signed (result->value.integer, gfc_integer_kinds[k].bit_size); - if (warn_conversion && kind < src->ts.kind) + if (warn_conversion && !src->do_not_warn && kind < src->ts.kind) gfc_warning_now (OPT_Wconversion, "Conversion from %qs to %qs at %L", gfc_typename (&src->ts), gfc_typename (&result->ts), &src->where); diff --git a/gcc/fortran/gfortran.h b/gcc/fortran/gfortran.h index 071dece717ce..c0bb9b5d4909 100644 --- a/gcc/fortran/gfortran.h +++ b/gcc/fortran/gfortran.h @@ -2106,6 +2106,9 @@ typedef struct gfc_expr /* Will require finalization after use. */ unsigned int must_finalize : 1; + /* Set this if no warning should be given somewhere in a lower level. */ + + unsigned int do_not_warn : 1; /* If an expression comes from a Hollerith constant or compile-time evaluation of a transfer statement, it may have a prescribed target- memory representation, and these cannot always be backformed from diff --git a/gcc/fortran/intrinsic.c b/gcc/fortran/intrinsic.c index 2f60fe8c8772..8eb815c9a5b6 100644 --- a/gcc/fortran/intrinsic.c +++ b/gcc/fortran/intrinsic.c @@ -4919,6 +4919,8 @@ gfc_convert_type_warn (gfc_expr *expr, gfc_typespec *ts, int eflag, int wflag) if (ts->type == BT_UNKNOWN) goto bad; + expr->do_not_warn = ! wflag; + /* NULL and zero size arrays get their type here. */ if (expr->expr_type == EXPR_NULL || (expr->expr_type == EXPR_ARRAY && expr->value.constructor == NULL)) diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 3195c9c06797..3499c0b3fd51 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -1,3 +1,9 @@ +2019-02-02 Thomas Koenig + + PR fortran/88298 + Backport from trunk + * gfortran.dg/warn_conversion_10.f90: New test. + 2019-02-02 Thomas Koenig PR fortran/57048 diff --git a/gcc/testsuite/gfortran.dg/warn_conversion_10.f90 b/gcc/testsuite/gfortran.dg/warn_conversion_10.f90 new file mode 100644 index 000000000000..e7d0a3ce1044 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/warn_conversion_10.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! { dg-options "-fno-range-check -Wconversion" } +! PR 88298 - this used to warn unnecessarily. Original test case by +! Harald Anlauf. +subroutine bug (j, js) + integer :: j, js(3,2) + js(:,:) = cshift (js(:,:), shift=j, dim=1) +end subroutine bug -- 2.47.2