From 88b712c241bb820f28d59cc8bfcbea575b3de654 Mon Sep 17 00:00:00 2001 From: Jakub Jelinek Date: Fri, 15 Dec 2017 23:00:48 +0100 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: r255716 --- gcc/fortran/ChangeLog | 6 ++++++ gcc/fortran/trans-openmp.c | 1 + gcc/testsuite/ChangeLog | 6 +++--- libgomp/ChangeLog | 5 +++++ libgomp/testsuite/libgomp.fortran/pr81304.f90 | 17 +++++++++++++++++ 5 files changed, 32 insertions(+), 3 deletions(-) create mode 100644 libgomp/testsuite/libgomp.fortran/pr81304.f90 diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog index bc7cf364e8f..c0b87086101 100644 --- a/gcc/fortran/ChangeLog +++ b/gcc/fortran/ChangeLog @@ -1,6 +1,12 @@ 2017-12-15 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 bf96b695778..4cef0b2be6e 100644 --- a/gcc/fortran/trans-openmp.c +++ b/gcc/fortran/trans-openmp.c @@ -1623,6 +1623,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/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog index 1ad72358707..372fe759edc 100644 --- a/gcc/testsuite/ChangeLog +++ b/gcc/testsuite/ChangeLog @@ -2,7 +2,7 @@ Backported from mainline 2017-11-24 Jakub Jelinek - + PR sanitizer/83014 * gcc.dg/ubsan/pr83014.c: New test. @@ -338,8 +338,8 @@ 2017-10-24 Qing Zhao Wilco Dijkstra - PR middle-end/80295 - * gcc.target/aarch64/pr80295.c: New test. + PR middle-end/80295 + * gcc.target/aarch64/pr80295.c: New test. 2017-10-21 Paul Thomas diff --git a/libgomp/ChangeLog b/libgomp/ChangeLog index 2ecd5585cac..ae4dbc68f50 100644 --- a/libgomp/ChangeLog +++ b/libgomp/ChangeLog @@ -1,6 +1,11 @@ 2017-12-15 Jakub Jelinek Backported from mainline + 2017-11-24 Jakub Jelinek + + PR fortran/81304 + * testsuite/libgomp.fortran/pr81304.f90: New test. + 2017-11-23 Jakub Jelinek PR fortran/81841 diff --git a/libgomp/testsuite/libgomp.fortran/pr81304.f90 b/libgomp/testsuite/libgomp.fortran/pr81304.f90 new file mode 100644 index 00000000000..460a2a04fb3 --- /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