From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.17.22]) by sourceware.org (Postfix) with ESMTPS id 6470C393F810; Fri, 18 Jun 2021 17:42:12 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 6470C393F810 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.10.156] ([79.251.10.156]) by web-mail.gmx.net (3c-app-gmx-bs67.server.lan [172.19.170.211]) (via HTTP); Fri, 18 Jun 2021 19:42:10 +0200 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [Patch, committed] PR fortran/101123 - [11/12 Regression] Invalid code for MAX0 with -fdefault-integer-8 Content-Type: multipart/mixed; boundary=abmob-3023aeb7-7664-4c98-b739-20688d9a46c2 Date: Fri, 18 Jun 2021 19:42:10 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:BAN30wXdEjPwDwQk4R+61Hbn90chHf38nHRbm7ELjIGyna4aiCZun9amFiHWdSqdDXUN1 J6cbneWiWY/A5iVysBxZS+caeDijUi5Zgx9o7LI2JhFimRGSuUsB1H+leYrzeVGJCKfz2UTZbh/d Ew+Z4l6qSyUBWWa3J22moz/tEM24OSNK1O0hGjlclaSy7D4cYumHLodo8hWbz9mW/enF6r+Ox7GG pcgFl2g+8LBv5u/mUcyHP9xn+z9BVVRvxMuhXkc3yesQpp8u65HCxs+5m7bIlcCIN/bh8y/E7KYU Jk= X-UI-Out-Filterresults: notjunk:1;V03:K0:dDczEZTyLfE=:cNLCObeacDWX6KNbthizoR BRTva6oJQVbuklVSyRvBfDhT00YibuPcAfXQFp7OtxpjCwJ5wImG2lXMLK8GLTuJ5RP4vb1/o FdJMz2YLW9RJAErxSoG0ugcuIobvs379IR6Xheze+oJcsm0lYVx/bBW1qtGIYSpMvD8rrVlLY POAc6bES1hts0E/rkTWR9pTV7I99BwnEu02XcEPeIFecM7O0/N2Nd3Wz9BTgjgJjMThh4TQja R5saPmhugtr8iC715Rzv+PhcsZOp3yAW8PkktPQGSWwgX5R4JScLPoEr+EbwpbuN8fV/qDxEQ eYkFUrhY5EPb7xktBrI7G+sQJD3MBUB7coJaNP+D0leAyR4xIqAjPYi0vkG1jFAEfuOiSI37i Z4GgTupPye51moakwppCElwEX9xkTpNuvtFBsRo7MMkqit+SHH1i5WBN2xUR4lxXAXe29FvZK HsSNrf5LfXKTMdvAnWqJiK8zKb0pAVbp84TIh/69Ms2mAZeNSu2M0knIvPR+lwrTh33Aiu2e8 +VdK+0rD4ytTlJfgfxYUQfxtpVRXJTuz5QxHK4+N5d+qG7XrF1m7JeUj222gk9rjbGEn4HPS8 S5JFZ0xS6YyoFWMad4VVja/64nGrco6YAXayAvCTOcqXvHT6RTOmrfRTH7if4mv4S8AGyGAvg szROcb7nNOk6B+pme7q10mABE9oSCP0z4w8EtBlyx7XOpRpmXWq3Dqs1UyUd1ee/1iSLKQnud Kqj3SJbKhWDEByDEzbsCglMrDMSEAtRfiHu9wy8bKzV23npNc/RgMxHCl/nnLT9GklDEmhyCu PUxCWHtQGrJ8s5WyXIKxYioOEa8RQ== X-Spam-Status: No, score=-11.5 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.2 X-Spam-Checker-Version: SpamAssassin 3.4.2 (2018-09-13) on server2.sourceware.org X-BeenThere: gcc-patches@gcc.gnu.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: Gcc-patches mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 18 Jun 2021 17:42:14 -0000 --abmob-3023aeb7-7664-4c98-b739-20688d9a46c2 Content-Type: text/plain; charset=UTF-8 As confirmed in the PR by Jakub, there was a bad conversion of the result of min0/max0 to the result type. We should just unconditionally convert in all cases. As a benefit, this also fixes pr100283. Committed after regtesting. Thanks, Harald Fortran - fix conversion to result type for the min/max intrinsic gcc/fortran/ChangeLog: PR fortran/100283 PR fortran/101123 * trans-intrinsic.c (gfc_conv_intrinsic_minmax): Unconditionally convert result of min/max to result type. gcc/testsuite/ChangeLog: PR fortran/100283 PR fortran/101123 * gfortran.dg/min0_max0_1.f90: New test. * gfortran.dg/min0_max0_2.f90: New test. --abmob-3023aeb7-7664-4c98-b739-20688d9a46c2 Content-Type: text/x-patch Content-Disposition: attachment; filename=pr101123.patch Content-Transfer-Encoding: quoted-printable diff --git a/gcc/fortran/trans-intrinsic.c b/gcc/fortran/trans-intrinsic.c index 73b0bcc9dea..e578449995a 100644 =2D-- a/gcc/fortran/trans-intrinsic.c +++ b/gcc/fortran/trans-intrinsic.c @@ -4147,10 +4147,7 @@ gfc_conv_intrinsic_minmax (gfc_se * se, gfc_expr * = expr, enum tree_code op) build_empty_stmt (input_location)); gfc_add_expr_to_block (&se->pre, tmp); } - if (TREE_CODE (type) =3D=3D INTEGER_TYPE) - se->expr =3D fold_build1_loc (input_location, FIX_TRUNC_EXPR, type, m= var); - else - se->expr =3D convert (type, mvar); + se->expr =3D convert (type, mvar); } diff --git a/gcc/testsuite/gfortran.dg/min0_max0_1.f90 b/gcc/testsuite/gfo= rtran.dg/min0_max0_1.f90 new file mode 100644 index 00000000000..118b0f03b52 =2D-- /dev/null +++ b/gcc/testsuite/gfortran.dg/min0_max0_1.f90 @@ -0,0 +1,9 @@ +! { dg-do compile } +! { dg-options "-std=3Dgnu" } +! PR fortran/100283 + +subroutine s () + integer(kind=3D8) :: i,j,k + i =3D min0 (j,k) + i =3D max0 (-127_8, min0 (j,127_8)) +end subroutine s diff --git a/gcc/testsuite/gfortran.dg/min0_max0_2.f90 b/gcc/testsuite/gfo= rtran.dg/min0_max0_2.f90 new file mode 100644 index 00000000000..3fe4fcd3609 =2D-- /dev/null +++ b/gcc/testsuite/gfortran.dg/min0_max0_2.f90 @@ -0,0 +1,10 @@ +! { dg-do compile } +! { dg-options "-fdefault-integer-8 -std=3Dgnu" } +! PR fortran/101123 + +SUBROUTINE TEST + IMPLICIT INTEGER*4 (I-N) + MAXMN=3DMAX0(M,N) + MINMN=3DMIN0(M,0_4) + MAXRS=3DMAX1(R,S) +END SUBROUTINE TEST --abmob-3023aeb7-7664-4c98-b739-20688d9a46c2--