From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from mout.gmx.net (mout.gmx.net [212.227.15.19]) by sourceware.org (Postfix) with ESMTPS id 4AE37385703D; Fri, 7 Jul 2023 18:32:21 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.2 sourceware.org 4AE37385703D Authentication-Results: sourceware.org; dmarc=pass (p=none dis=none) header.from=gmx.de Authentication-Results: sourceware.org; spf=pass smtp.mailfrom=gmx.de DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=gmx.de; s=s31663417; t=1688754740; x=1689359540; i=anlauf@gmx.de; bh=fO6Jiy1zW3g1XAJty1V2yR7vzTWkhuCCM0F971iXFT4=; h=X-UI-Sender-Class:From:To:Subject:Date; b=XmDNRs0ztXD8SEYIHuvylwOo4tQxGG6SA3t/MJ3/PY7hSXUcoZd3NK38u99kvSkvmqj5kSr GW6axHtidwCza7V6croKLjJhCsffPNAh/gRxzJIIA7oD2XaaLtMOHvSsKLC4D9sfxlH1o65f5 sVb91iiwSFnq1tC6+KjC8nIjPkhmOxuOG1tQKMhLN4U+ddP9JRmvLVqxQUb1YiPNSLXL7H6jX nBt/1mAr+Nzw8/0or65J9Rx/2Mq8msLz76xftp1h5affzzkpiRg7+p32FaSJn6mWl29bbK2K2 vI5glQiYyDwoZIm11cPYv2ePRN0yV43wJUqZs4vSqLwItRoBrHPA== X-UI-Sender-Class: 724b4f7f-cbec-4199-ad4e-598c01a50d3a Received: from [93.207.83.196] ([93.207.83.196]) by web-mail.gmx.net (3c-app-gmx-bs47.server.lan [172.19.170.99]) (via HTTP); Fri, 7 Jul 2023 20:32:20 +0200 MIME-Version: 1.0 Message-ID: From: Harald Anlauf To: fortran , gcc-patches Subject: [PATCH] Fortran: simplification of FINDLOC for constant complex arguments [PR110585] Content-Type: multipart/mixed; boundary=refeik-cab39046-ec94-4e1c-bb35-51cf0b4688a6 Date: Fri, 7 Jul 2023 20:32:20 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:kjOo/b9oTUj5N//MILsfQKzsnHyLjTU1u9nSsiY8kQ1RVheIfT5+Fis1VMm1o5GK3Wkox glgpYSViGu+LwYjvTsC3exURPAApdiIHYVpe0d8w198yMehJadqSlHJN4d4bsEPrAkwdxK03rIyT GDSpfSeN8AYVWmZwtxyo57eO+JwcHWXkB1WB6eZxNxxcOeVdKuEB8LYCcuH9/c2JjAQefOton9yS TY7k694aW6gVS9mT8mYXjXowzVZtznIUNTdtBUvCT0A9K83rIpRpvN/e+NoCTCdYN3IC+ZxcZTrl sU= UI-OutboundReport: notjunk:1;M01:P0:9yVKBkPYwt0=;Krd4FiHesU0fR3MpFtE4Y+DtDa7 Wyk/ttpEwORHkoPOa6hsfLDXdmE20mFQYnoOV+Q9blYPA/jmW+Hq3DJ1Xc3ZA+VLbnLKkzfzK RLm9QoHofMH91Y0BJkQYe7P2LgHmY+sxYwgqBib5OjcobQGoA3l4L/7hR2MgaMlxO5uBm6pae qZhfGEV1LcZjY49X/wZVwrVqXOsRoW9VsZ3EmPcm8QGGGyHrwWGa33bubmS+2rfWPEdG/+uLj 1LuBOnQE1uthqPOp83MYHpx7n++3opI7BAfyhlTRGx5pA2KaGUrhQ75dyTbYRpzDACW13AvK5 cD1pr2UdXnR8Yhj+un1EEJ3yHOiMDLWh612LSJSQHxs9ses39nD/7yuY1C2yMvbqRDXCW2ffC LdKg1bAWqn51CGm1haE40lwXmitsZWZH/vJufu8fRNjDCKUUwuoyUgpVvsf4ZDRU7ggyU55kK HSRZ7kHtM4FczI3LnGXkZ54msUHC0BVRDMvmgguLLQtFJ7dUcmT8XSiCqK/HX/ABB06F0ltFE exyBUC4QIPeCSAkv4T99oQwJlUTGV/WCRPyhhRpqCykglZ6PRAvu+396ZYu+EgaLNhm1b/w9T xdmULNgW4mfldeFOkQhesBqglSzYy94D9CZWZrFH3Q7FQJrQQi4YekULBYR7JEYsf4Zzqdrpm U5Gc59l/wD1veiEsLvX2zyF7tnPSs1dnjV1T83pyN549WH0Qh4Thc03VVyQhxRINIiqAh/SK9 wENxw75IdQLyGW84rnug9jAO5i8BqOFWf/rC7W65tzpkMYiapvoPek75gb9qvj6y6356afqPb 78L+gRCzuG5LLqZ+4blGO0lQ== X-Spam-Status: No, score=-11.9 required=5.0 tests=BAYES_00,DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,FREEMAIL_FROM,GIT_PATCH_0,RCVD_IN_DNSWL_LOW,RCVD_IN_MSPIKE_H2,SPF_HELO_NONE,SPF_PASS,TXREP,T_SCC_BODY_TEXT_LINE autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on server2.sourceware.org List-Id: --refeik-cab39046-ec94-4e1c-bb35-51cf0b4688a6 Content-Type: text/plain; charset=UTF-8 Dear all, I intend to commit the attached obvious patch within 24h unless someone objects. gfc_compare_expr() did not handle the case of complex constants, which may be compared for equality. This case is needed in the simplification of the FINDLOC intrinsic. Regtested on x86_64-pc-linux-gnu. Thanks, Harald --refeik-cab39046-ec94-4e1c-bb35-51cf0b4688a6 Content-Type: text/x-patch Content-Disposition: attachment; filename=pr110585.diff Content-Transfer-Encoding: quoted-printable =46rom b6c4f70d2dac4863335874f0bd3486ea7db348d7 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Fri, 7 Jul 2023 20:25:06 +0200 Subject: [PATCH] Fortran: simplification of FINDLOC for constant complex arguments [PR110585] gcc/fortran/ChangeLog: PR fortran/110585 * arith.cc (gfc_compare_expr): Handle equality comparison of constant complex gfc_expr arguments. gcc/testsuite/ChangeLog: PR fortran/110585 * gfortran.dg/findloc_9.f90: New test. =2D-- gcc/fortran/arith.cc | 5 +++++ gcc/testsuite/gfortran.dg/findloc_9.f90 | 19 +++++++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/findloc_9.f90 diff --git a/gcc/fortran/arith.cc b/gcc/fortran/arith.cc index 86d56406047..f9c6658f860 100644 =2D-- a/gcc/fortran/arith.cc +++ b/gcc/fortran/arith.cc @@ -1120,6 +1120,11 @@ gfc_compare_expr (gfc_expr *op1, gfc_expr *op2, gfc= _intrinsic_op op) || (op1->value.logical && !op2->value.logical)); break; + case BT_COMPLEX: + gcc_assert (op =3D=3D INTRINSIC_EQ); + rc =3D mpc_cmp (op1->value.complex, op2->value.complex); + break; + default: gfc_internal_error ("gfc_compare_expr(): Bad basic type"); } diff --git a/gcc/testsuite/gfortran.dg/findloc_9.f90 b/gcc/testsuite/gfort= ran.dg/findloc_9.f90 new file mode 100644 index 00000000000..05974476cb3 =2D-- /dev/null +++ b/gcc/testsuite/gfortran.dg/findloc_9.f90 @@ -0,0 +1,19 @@ +! { dg-do compile } +! { dg-options "-fdump-tree-original" } +! PR fortran/110585 - simplification of FINDLOC for constant complex argu= ments + +program mvce + implicit none + integer, parameter :: a(*) =3D findloc([(1.,0.),(2.,1.)], (2.,0.)) + integer, parameter :: b(*) =3D findloc([(1.,0.),(2.,1.)], (2.,0.), back= =3D.true.) + integer, parameter :: c(*) =3D findloc([(1.,0.),(2.,1.)], (2.,1.)) + integer, parameter :: d(*) =3D findloc([(1.,0.),(2.,1.)], (2.,1.), back= =3D.true.) + integer, parameter :: e =3D findloc([(1.,0.),(2.,1.)], (2.,1.), dim= =3D1) + if (a(1) /=3D 0) stop 1 + if (b(1) /=3D 0) stop 2 + if (c(1) /=3D 2) stop 3 + if (d(1) /=3D 2) stop 4 + if (e /=3D 2) stop 5 +end + +! { dg-final { scan-tree-dump-not "_gfortran_stop_numeric" "original" } } =2D- 2.35.3 --refeik-cab39046-ec94-4e1c-bb35-51cf0b4688a6--