From patchwork Mon Dec 20 22:05:13 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Harald Anlauf X-Patchwork-Id: 49126 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 EF870385800B for ; Mon, 20 Dec 2021 22:06:01 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org EF870385800B DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gcc.gnu.org; s=default; t=1640037962; bh=DZsIsJGyPffkW3tjds9mgzq715BWHuISWHTAPWslTAs=; h=To:Subject:Date:List-Id:List-Unsubscribe:List-Archive:List-Post: List-Help:List-Subscribe:From:Reply-To:From; b=v0uBP9NzzG5sssOGk42HeoSc7jgttSeZxeva2xf5GFB+4fYQID7urKDvtK+P1MgKQ rqoooKcWbDL/YwYdMCF65PX/Y4D2HwPWsrC9HZVO4I13nKYOPIuzXtxuqH2YXYoHiT p1B1e5+J0axCzAjTAZMd2CyEJMHtZ/0gIts1oDw4= 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.21]) by sourceware.org (Postfix) with ESMTPS id 8F9253858D39; Mon, 20 Dec 2021 22:05:15 +0000 (GMT) DMARC-Filter: OpenDMARC Filter v1.4.1 sourceware.org 8F9253858D39 X-UI-Sender-Class: 01bb95c1-4bf8-414a-932a-4f6e2808ef9c Received: from [79.251.14.138] ([79.251.14.138]) by web-mail.gmx.net (3c-app-gmx-bap28.server.lan [172.19.172.98]) (via HTTP); Mon, 20 Dec 2021 23:05:13 +0100 MIME-Version: 1.0 Message-ID: To: fortran , gcc-patches Subject: [PATCH] PR fortran/103777 - ICE in gfc_simplify_maskl, at fortran/simplify.c:4918 Date: Mon, 20 Dec 2021 23:05:13 +0100 Importance: normal Sensitivity: Normal X-Priority: 3 X-Provags-ID: V03:K1:82NSLtb++a59JswBNlMyhuOacwP+lobh60iu6A/3B2iCWhCg3UouDm0/6l0AOW5nEugp4 KzEsm1lz0oGmOdIM19aSpmuqM8oL2ksXc3ybEf8AsNbGm/d0qVn0+ao+x5k/DPXTUojHVongvfzU 6I0G7p54MXJwR+pslABUriVPtX/trvVaHdE7Y7zjgOJFBATgOVNd9Rkzwd62V0vdYRycmu9g1kFf cPWcSGaW96WkCrRl3pY4+3LeAL/1G19ikozsV4kqgMzo0NUXcVAtu/DSBm4browoCze4oPwoBygG Jk= X-UI-Out-Filterresults: notjunk:1;V03:K0:GJCHBTgieTI=:2ul+MKQ2lU/l/6rZzMyuLs Ynul5G1RYN0z5gE6zaoPKoOoMJfHgEnIRoepkowpiXYjmP3nWRGnhWQsoC3P9y/FOzZBK7aEm SXJE5+1ffADuV5OUT80r80QTFwA4T2/JSXepS++GKwF94SYT4DutrUx8ubWhiru40npyJ6nsM 94D80nCh9XhvyQi5FzdV4Vp98CzZmXkz6Wvu0jvPDffHy6sK8+H3b/sdaSUfW3CgKYuYt9XGq 9Cg0tgXvT+sZXwMVM0s+zNf+7zqQ04BXYrdQMNYKYjRpoiN3QioTDaHZTxSkPNsTu3LWfOz9j EtvcCUvN+/pmI1/xQY1rYECOIY5Ay9XlJUaJvbkFeTo4P5puh6mhZ5zomR+JvjhBZCe3nVo1v GamIAdLQzHO21vQq/Jlgo/sPTCwVM8xPmENxmrs4PxYiyAHxBYNHxSQwK2iX8/kn3dvwTY9VC fhN1wJTi08AOvC0KsnDvjMrkWrkpahUeXpOP15laJbBuu25r/4lB37pqOyYHz/uyHzGlMV2HG rYuun4oeDSnQqUwvhJ4lE3nUoJgdTOZCcaw6mVVceH2BcSaoR1plqcwjhzYz0PBm2gWyBPH4r EdCl9/3K3XL/1BhF4oe87QVvDarcZirujXQevOobQYaeRS5BYODD/7TPqHDEgdRG6VBL0mBld LLhODQZcap1NgOIDVewfyHyTVAqlLfQy0bzHTB5rYhirqdpJ1sOI5LLeVOQDLUe+Q7pEoMknd SDiZebkuhFCguCu9Zs3AH9u3JS9ctFK9nQa9WgozEfWdAyjnCfBqtr5FCNmcqkrkvM6QW2EYo 7YYAKUo X-Spam-Status: No, score=-11.6 required=5.0 tests=BAYES_00, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, GIT_PATCH_0, KAM_NUMSUBJECT, RCVD_IN_DNSWL_NONE, SPF_HELO_NONE, SPF_PASS, TXREP autolearn=ham autolearn_force=no version=3.4.4 X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) 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 need to check the arguments of the elemental MASKL and MASKR intrinsics also before simplifying. Testcase by Gerhard. The fix is almost obvious, but I'm happy to get feedback in case there is something I overlooked. (There is already a check on scalar arguments to MASKL/MASKR, which however misses the case of array arguments.) Regtested on x86_64-pc-linux-gnu. OK for mainline? Thanks, Harald From b58a44bc861ee3d1e67e3b7c949a301b6290c05c Mon Sep 17 00:00:00 2001 From: Harald Anlauf Date: Mon, 20 Dec 2021 22:59:53 +0100 Subject: [PATCH] Fortran: check arguments of MASKL/MASKR intrinsics before simplification gcc/fortran/ChangeLog: PR fortran/103777 * simplify.c (gfc_simplify_maskr): Check validity of argument 'I' before simplifying. (gfc_simplify_maskl): Likewise. gcc/testsuite/ChangeLog: PR fortran/103777 * gfortran.dg/masklr_3.f90: New test. --- gcc/fortran/simplify.c | 6 ++++++ gcc/testsuite/gfortran.dg/masklr_3.f90 | 14 ++++++++++++++ 2 files changed, 20 insertions(+) create mode 100644 gcc/testsuite/gfortran.dg/masklr_3.f90 diff --git a/gcc/fortran/simplify.c b/gcc/fortran/simplify.c index 90067b6bbe6..b6f636d4ff1 100644 --- a/gcc/fortran/simplify.c +++ b/gcc/fortran/simplify.c @@ -4878,6 +4878,9 @@ gfc_simplify_maskr (gfc_expr *i, gfc_expr *kind_arg) bool fail = gfc_extract_int (i, &arg); gcc_assert (!fail); + if (!gfc_check_mask (i, kind_arg)) + return &gfc_bad_expr; + result = gfc_get_constant_expr (BT_INTEGER, kind, &i->where); /* MASKR(n) = 2^n - 1 */ @@ -4909,6 +4912,9 @@ gfc_simplify_maskl (gfc_expr *i, gfc_expr *kind_arg) bool fail = gfc_extract_int (i, &arg); gcc_assert (!fail); + if (!gfc_check_mask (i, kind_arg)) + return &gfc_bad_expr; + result = gfc_get_constant_expr (BT_INTEGER, kind, &i->where); /* MASKL(n) = 2^bit_size - 2^(bit_size - n) */ diff --git a/gcc/testsuite/gfortran.dg/masklr_3.f90 b/gcc/testsuite/gfortran.dg/masklr_3.f90 new file mode 100644 index 00000000000..eb689f0f408 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/masklr_3.f90 @@ -0,0 +1,14 @@ +! { dg-do compile } +! PR fortran/103777 - ICE in gfc_simplify_maskl +! Contributed by G.Steinmetz + +program p + print *, maskl([999]) ! { dg-error "must be less than or equal" } + print *, maskr([999]) ! { dg-error "must be less than or equal" } + print *, maskl([-999]) ! { dg-error "must be nonnegative" } + print *, maskr([-999]) ! { dg-error "must be nonnegative" } + print *, maskl([32],kind=4) + print *, maskl([33],kind=4) ! { dg-error "must be less than or equal" } + print *, maskl([64],kind=8) + print *, maskl([65],kind=8) ! { dg-error "must be less than or equal" } +end -- 2.26.2