From b9410019c355ac9e86bb4d09125bdba89a8329e0 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Mon, 25 Jun 2018 18:55:44 +0200 Subject: [PATCH] backport: re PR fortran/81304 (Bogus warning with -Wsurprising and -fopenmp: Type specified for intrinsic function 'min' / 'max') Backported from mainline 2017-11-24 Jakub Jelinek PR fortran/81304 * trans-openmp.c (gfc_trans_omp_array_reduction_or_udr): Set attr.implicit_type in intrinsic_sym to avoid undesirable warning. * testsuite/libgomp.fortran/pr81304.f90: New test. From-SVN: r262039 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-openmp.c | 1 + libgomp/ChangeLog | 5 +++++ libgomp/testsuite/libgomp.fortran/pr81304.f90 | 17 +++++++++++++++++ 4 files changed, 29 insertions(+) create mode 100644 libgomp/testsuite/libgomp.fortran/pr81304.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index de557c79a13e..3fff776fd966 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,6 +1,12 @@ 2018-06-25 Jakub Jelinek Backported from mainline + 2017-11-24 Jakub Jelinek + + PR fortran/81304 + * trans-openmp.c (gfc_trans_omp_array_reduction_or_udr): Set + attr.implicit_type in intrinsic_sym to avoid undesirable warning. + 2017-11-23 Dirk Broemmel Jakub Jelinek diff --git a/gcc/fortran/trans-openmp.c b/gcc/fortran/trans-openmp.c index d68f99b7d706..cc9afaacb2c1 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -1584,6 +1584,7 @@ gfc_trans_omp_array_reduction_or_udr (tree c, gfc_omp_namelist *n, locus where) intrinsic_sym.attr.referenced = 1; intrinsic_sym.attr.intrinsic = 1; intrinsic_sym.attr.function = 1; + intrinsic_sym.attr.implicit_type = 1; intrinsic_sym.result = &intrinsic_sym; intrinsic_sym.declared_at = where; diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 4b777e831a8b..9671eacd9101 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,6 +1,11 @@ 2018-06-25 Jakub Jelinek Backported from mainline + 2017-11-24 Jakub Jelinek + + PR fortran/81304 + * testsuite/libgomp.fortran/pr81304.f90: New test. + 2017-11-23 Dirk Broemmel Jakub Jelinek diff --git a/libgomp/testsuite/libgomp.fortran/pr81304.f90 b/libgomp/testsuite/libgomp.fortran/pr81304.f90 new file mode 100644 index 000000000000..460a2a04fb33 --- /dev/null +++ b/libgomp/testsuite/libgomp.fortran/pr81304.f90 @@ -0,0 +1,17 @@ +! PR fortran/81304 +! { dg-do run } +! { dg-options "-Wsurprising" } + +program pr81304 + integer :: i + real, dimension(1:3) :: a, b, c + a = 128 + b = 0 +!$omp parallel do reduction(min: a) reduction(max: b) private (c) ! { dg-bogus "Type specified for intrinsic function" } + do i = 1, 16 + c = (/ i, i - 5, i + 5 /) + a = min (a, c) + b = max (b, c) + end do + if (any (a /= (/ 1, -4, 6 /)) .or. any (b /= (/ 16, 11, 21 /))) call abort +end -- 2.47.2