From patchwork Tue Sep 20 20:57:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 57825 Return-Path: X-Original-To: patchwork@sourceware.org Delivered-To: patchwork@sourceware.org Received: from server2.sourceware.org (localhost [IPv6:::1]) by sourceware.org (Postfix) with ESMTP id 5FBA23858005 for ; Tue, 20 Sep 2022 20:58:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org 5FBA23858005 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1663707502; bh=S4I48uRWUmNSUXeD0vxrAW6oNhtZZsyP6bVO45T15xI=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=h6jUlhzSTtopKeuKNIylRB5f89t5hyOWC5ZRmg1v8lNBGd+pHHsqHm9o5kTQ/MKVz nBxSOp7TJv6mkjWiS9tcaEHGKvM6PeE9YWcnwSZPzNVvjEQsO2fgi2BRo4Fk3cNVim 2+HhnKgP3femCuw64WeABDKmqRU6cZzhdwH5c8GI= X-Original-To: gcc-patches@gcc.gnu.org Delivered-To: gcc-patches@gcc.gnu.org Received: from mout.gmx.net (mout.gmx.net [212.227.17.20]) by sourceware.org (Postfix) with ESMTPS id 4E4D93858C55; Tue, 20 Sep 2022 20:57:43 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 4E4D93858C55 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [93.207.88.67] ([93.207.88.67]) by web-mail.gmx.net (3c-app-gmx-bap12.server.lan [172.19.172.82]) (via HTTP); Tue, 20 Sep 2022 22:57:41 +0200 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH, committed] Fortran: error recovery on invalid ARRAY argument to FINDLOC [PR106986] Date: Tue, 20 Sep 2022 22:57:41 +0200 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:W0gKxwuJkm6InGYc8FHbbTFvAEnFtvfokLOTKddlThRFLLV9xbEPWsXeoa66U+koVz/6R vo+IqaxY/+7kjNkV3rAn8OSK6F6hgYnzne67Yjt6SJOkLA/w9tKLBXfFvVTqvBd/dcqyMm5dsAdJ cV7IOX12rFw7vY3lTapv3AEDf9SHrEd8hhEAi+TF3y8dxrHIqG6BHTVdG6s3rJnuk85BJd/JvVqa u+0559vh+ngeNqm1aMPVbonreBN7MsIjbmSU7vI8Qb1Juf8OswIjvworNHRYjSkumBbyZIBmUiHz jc= X-UI-Out-Filterresults: notjunk:1;V03:K0:CaNgXXVljgU=:Njsnw9NC7aWk6dEIEQzaRb yq6neuAz2n2Q+BbWwt9Arf5TgByFhZB4J52IDzgv10oUr7oobSuL4P4uWcm/HJiyBs67mQ9Eu niqzwHCl1hD+/o1RMjYIu6QMpVVudEgie7Hix75dDWaQRv6v8rcJzEHHDT1bOxTcdv41V1wHy avAyVoQNh302CElsffVU/RCNSzi9jddue3BkxdIvgp6EHxJMZ2xutQRS18cCM0ANB1FyvS8C9 oBfgzI6avQ1u92tBuaNdkeqhRkwEBKLvagtDc/8kHLPDc4RTsGQT83W2HpFb5o4g64moci8// BMzUO3Bqvbq2gSyAMKgBwp/8U/Y9VBICopa/lY50At6zGBR8t4a8AXr0UT2J2FSlqjaljal7n rNvDZWSQ7O+SelUFC1lcGSFiIIXZhWOn4LdDMyEWQWcs3dH6IH9na+lq/2YFnGjAiL8XMe4n9 p1k81M4F9CZ7IGfz4pDEIcxH+BEVsWXYWrnGTbqhcT7F0bPYoOYKcfgsVNWua+ge5jgeiU6p+ 9YUUk0NX+A0h6iLuC/YNCIFzqzoQtR45s0afbfCY7JGtPC+jsD4kbbiKlsc34/7SjIJf+1Q+0 UVW4kVSJnUAAllOcpUZp+0A9OZsgla4hJQi2SK5/5LsV1ptTdox7Kpa2uJZ+9p4MkMv1CrKdG hFXPEoBqR9PxSxmHKboQToB+ZaNAjyKeIvHNGB0svktnzBCvwoUq1d0DBbn+02h6W7hWQenaI TJUXStCzqnFVRlWLu9QMj/Eb0Fkz+ftHiYVtBx+7HicOxa79IvYrFUUnPbU= X-Spam-Status: No, score=-12.0 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_SHORT, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H2, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) 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-Patchwork-Original-From: Harald Anlauf via Gcc-patches From: Harald Anlauf Reply-To: Harald Anlauf Errors-To: gcc-patches-bounces+patchwork=sourceware.org@gcc.gnu.org Sender: "Gcc-patches" Dear all, we ICE'd in the simplification of FINDLOC when the passed ARRAY argument had an invalid declaration. The reason was a reference to array->shape which was NULL. Obvious solution: then just don't attempt to simplify. Regtested on x86_64-pc-linux-gnu and pushed to mainline as https://gcc.gnu.org/g:5976fbf9d5dd9542fcb82eebb2185886fd52d000 The PR is marked as a 10/11/12/13 regression, thus I plan to backport. Thanks, Harald From 5976fbf9d5dd9542fcb82eebb2185886fd52d000 Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Tue, 20 Sep 2022 22:41:48 +0200 Subject: [PATCH] Fortran: error recovery on invalid ARRAY argument to FINDLOC [PR106986] gcc/fortran/ChangeLog: PR fortran/106986 * simplify.cc (gfc_simplify_findloc): Do not try to simplify intrinsic FINDLOC when the ARRAY argument has a NULL shape. gcc/testsuite/ChangeLog: PR fortran/106986 * gfortran.dg/pr106986.f90: New test. --- gcc/fortran/simplify.cc | 1 + gcc/testsuite/gfortran.dg/pr106986.f90 | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/pr106986.f90 diff --git a/gcc/fortran/simplify.cc b/gcc/fortran/simplify.cc index 140c17721a7..c0fbd0ed7c2 100644 --- a/gcc/fortran/simplify.cc +++ b/gcc/fortran/simplify.cc @@ -5895,6 +5895,7 @@ gfc_simplify_findloc (gfc_expr *array, gfc_expr *value, gfc_expr *dim, bool back_val = false; if (!is_constant_array_expr (array) + || array->shape == NULL || !gfc_is_constant_expr (dim)) return NULL; diff --git a/gcc/testsuite/gfortran.dg/pr106986.f90 b/gcc/testsuite/gfortran.dg/pr106986.f90 new file mode 100644 index 00000000000..a309b25d181 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr106986.f90 @@ -0,0 +1,8 @@ +! { dg-do compile } +! PR fortran/106986 - ICE in simplify_findloc_nodim +! Contributed by G.Steinmetz + +program p + integer, parameter :: a(:) = [1] ! { dg-error "deferred shape" } + print *, findloc (a, 1) +end -- 2.35.3