From patchwork Fri Feb 14 13:14:55 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Mark Eggleston X-Patchwork-Id: 1238032 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (sender SPF authorized) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-519544-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=fail (p=none dis=none) header.from=codethink.co.uk Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.a=rsa-sha1 header.s=default header.b=cJtmQ0lA; dkim-atps=neutral Received: from sourceware.org (server1.sourceware.org [209.132.180.131]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 48Jv4b59j6z9s29 for ; Sat, 15 Feb 2020 00:15:09 +1100 (AEDT) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; q=dns; s=default; b=B7RaYr8jZNr1GEIaYwUU/WXex8b3SPLqkFcMUC3mZuJXdqIdYi WTfkfIvL4JpQymuEvYj+XXiCryeHFkv4vi95TtcA+VfkxFA1ao1wYNuptzIkFLgc Cs2+1Bh7IjMyCEltLCJngtvrrBpHujjw+//QXbTmJT7qtz4J501idqJP8= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:to :from:subject:message-id:date:mime-version:content-type; s= default; bh=sy9Gl/nLrjkBnx6zwi8miUgpVzk=; b=cJtmQ0lAZSQPuIxiB50v 7Q2t98Hu+yqkqfhWoE9wLhSiqGPwYCc7jLihzNh5xTvYBjq48ramxcif0y8+zqfS WTmvQUTNpkvJkmDH8hBVOnky/4H1MjlG4w12B4eMlEwJI0haRq9RGkszHbBHX3g+ 80MPqjBhuPvXTliVeVeymag= Received: (qmail 75713 invoked by alias); 14 Feb 2020 13:15:01 -0000 Mailing-List: contact gcc-patches-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Unsubscribe: List-Archive: List-Post: List-Help: Sender: gcc-patches-owner@gcc.gnu.org Delivered-To: mailing list gcc-patches@gcc.gnu.org Received: (qmail 75698 invoked by uid 89); 14 Feb 2020 13:15:00 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-20.0 required=5.0 tests=AWL, BAYES_00, GIT_PATCH_0, GIT_PATCH_1, GIT_PATCH_2, GIT_PATCH_3, KAM_COUK, KAM_NUMSUBJECT, KAM_SHORT, SPF_HELO_PASS, SPF_PASS autolearn=ham version=3.3.1 spammy=H*F:D*co.uk, UD:co.uk X-HELO: imap3.hz.codethink.co.uk Received: from imap3.hz.codethink.co.uk (HELO imap3.hz.codethink.co.uk) (176.9.8.87) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Fri, 14 Feb 2020 13:14:58 +0000 Received: from [167.98.27.226] (helo=[10.35.5.172]) by imap3.hz.codethink.co.uk with esmtpsa (Exim 4.92 #3 (Debian)) id 1j2ao4-00050c-1a; Fri, 14 Feb 2020 13:14:56 +0000 To: gcc-patches , fortran From: Mark Eggleston Subject: [8/9/10 Regression, patch][PR93714] ICE in gfc_check_same_strlen, at fortran/check.c:1253 Message-ID: <4a83fa75-fc10-7364-6d9b-30a9ef890dac@codethink.co.uk> Date: Fri, 14 Feb 2020 13:14:55 +0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:68.0) Gecko/20100101 Thunderbird/68.4.1 MIME-Version: 1.0 Please find attached a patch fixing the ICE in PR93714. Tested on: master at https://gcc.gnu.org/g:e235031d490e8ed2aa0bc229694975493fd58977 gcc 9 branch at https://gcc.gnu.org/g:d7ab361df604fb66e1ba1e3fb45b4453cba803c4 gcc 8 branch at https://gcc.gnu.org/g:1b169f1ea0c9fab7712ede65edb0ffb6e021ad7c All test OK, however, gcc 9 and gcc 8 report: XPASS: gfortran.dg/typebound_call_22.f03   -O scan-tree-dump-times optimized "base \\(\\);" 1 with and without the patch. Note: there is a change in error message handled by char_pointer_assign_6.f90     9 |   p1 => c(1:) ! { dg-error "Pointer assignment target" }       |  1 Error: Unequal character lengths (20/4) in pointer assignment at (1) char_pointer_assign_6.f90:10:2:    10 |   p1 => c(:4) ! { dg-error "Pointer assignment target" }       |  1 Error: Unequal character lengths (20/4) in pointer assignment at (1) the following is reported:     9 |   p1 => c(1:) ! { dg-error "Pointer assignment target" }       |        1 Error: Pointer assignment target is neither TARGET nor POINTER at (1) char_pointer_assign_6.f90:10:8:    10 |   p1 => c(:4) ! { dg-error "Pointer assignment target" }       |        1 Error: Pointer assignment target is neither TARGET nor POINTER at (1) this is because c does not have TARGET or POINTER attributes specified. Change logs: gcc/fortran/ChangeLog     Mark Eggleston      PR fortran/93714     * expr.c (gfc_check_pointer_assign): Move check for     matching character length to after checking the lvalue     attributes for target or pointer. gcc/testsuite/ChangeLog     Mark Eggleston      PR fortran/93714     * gfortran.dg/char_pointer_assign_6.f90: Look for no target     message instead of length mismatch.     * gfortran.dg/pr93714_1.f90     * gfortran.dg/pr93714_2.f90 OK to commit? From 9c83f31b3ed530c605356cd7459e150e2284c5e0 Mon Sep 17 00:00:00 2001 From: Mark Eggleston Date: Thu, 13 Feb 2020 15:58:20 +0000 Subject: [PATCH] fortran: ICE assign character pointer to non target PR93714 An ICE occurred if an attempt was made to assign a pointer to a character variable that has an length incorrectly specified using a real constant and does not have the target attribute. gcc/fortran/ChangeLog PR fortran/93714 * expr.c (gfc_check_pointer_assign): Move check for matching character length to after checking the lvalue attributes for target or pointer. gcc/testsuite/ChangeLog PR fortran/93714 * gfortran.dg/char_pointer_assign_6.f90: Look for no target message instead of length mismatch. * gfortran.dg/pr93714_1.f90 * gfortran.dg/pr93714_2.f90 --- gcc/fortran/expr.c | 14 +++++++------- gcc/testsuite/gfortran.dg/char_pointer_assign_6.f90 | 4 ++-- gcc/testsuite/gfortran.dg/pr93714_1.f90 | 11 +++++++++++ gcc/testsuite/gfortran.dg/pr93714_2.f90 | 11 +++++++++++ 4 files changed, 31 insertions(+), 9 deletions(-) create mode 100644 gcc/testsuite/gfortran.dg/pr93714_1.f90 create mode 100644 gcc/testsuite/gfortran.dg/pr93714_2.f90 diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c index a9698c3e3d2..79e00b4112a 100644 --- a/gcc/fortran/expr.c +++ b/gcc/fortran/expr.c @@ -4222,13 +4222,6 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue, if (rvalue->expr_type == EXPR_NULL) return true; - if (lvalue->ts.type == BT_CHARACTER) - { - bool t = gfc_check_same_strlen (lvalue, rvalue, "pointer assignment"); - if (!t) - return false; - } - if (rvalue->expr_type == EXPR_VARIABLE && is_subref_array (rvalue)) lvalue->symtree->n.sym->attr.subref_array_pointer = 1; @@ -4284,6 +4277,13 @@ gfc_check_pointer_assign (gfc_expr *lvalue, gfc_expr *rvalue, } } + if (lvalue->ts.type == BT_CHARACTER) + { + bool t = gfc_check_same_strlen (lvalue, rvalue, "pointer assignment"); + if (!t) + return false; + } + if (is_pure && gfc_impure_variable (rvalue->symtree->n.sym)) { gfc_error ("Bad target in pointer assignment in PURE " diff --git a/gcc/testsuite/gfortran.dg/char_pointer_assign_6.f90 b/gcc/testsuite/gfortran.dg/char_pointer_assign_6.f90 index cd90bfc06e3..e0e116074ae 100644 --- a/gcc/testsuite/gfortran.dg/char_pointer_assign_6.f90 +++ b/gcc/testsuite/gfortran.dg/char_pointer_assign_6.f90 @@ -6,6 +6,6 @@ program main character (len=4) :: c s1 = 'abcd' p1 => s1(2:3) ! { dg-error "Unequal character lengths \\(20/2\\)" } - p1 => c(1:) ! { dg-error "Unequal character lengths \\(20/4\\)" } - p1 => c(:4) ! { dg-error "Unequal character lengths \\(20/4\\)" } + p1 => c(1:) ! { dg-error "Pointer assignment target" } + p1 => c(:4) ! { dg-error "Pointer assignment target" } end diff --git a/gcc/testsuite/gfortran.dg/pr93714_1.f90 b/gcc/testsuite/gfortran.dg/pr93714_1.f90 new file mode 100644 index 00000000000..40f4a4bf89f --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr93714_1.f90 @@ -0,0 +1,11 @@ +! { dg-do compile } +! PR 93714 +! Original test case from G. Steinmetz + +program test + character((1.)) :: a + character, pointer :: b => a +end program + +! { dg-error "must be of INTEGER type" " " { target *-*-* } 6 } +! { dg-error "does not have the TARGET attribute" " " { target *-*-* } 7 } diff --git a/gcc/testsuite/gfortran.dg/pr93714_2.f90 b/gcc/testsuite/gfortran.dg/pr93714_2.f90 new file mode 100644 index 00000000000..86658f28859 --- /dev/null +++ b/gcc/testsuite/gfortran.dg/pr93714_2.f90 @@ -0,0 +1,11 @@ +! { dg-do compile } +! PR 93714 +! Original test case from G. Steinmetz + +program test + character((9.)) :: a + character(:), pointer :: b => a +end program + +! { dg-error "must be of INTEGER type" " " { target *-*-* } 6 } +! { dg-error "does not have the TARGET attribute" " " { target *-*-* } 7 } -- 2.11.0