From patchwork Sun Dec 16 03:35:38 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Kargl X-Patchwork-Id: 1014027 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Authentication-Results: ozlabs.org; spf=pass (mailfrom) smtp.mailfrom=gcc.gnu.org (client-ip=209.132.180.131; helo=sourceware.org; envelope-from=gcc-patches-return-492585-incoming=patchwork.ozlabs.org@gcc.gnu.org; receiver=) Authentication-Results: ozlabs.org; dmarc=none (p=none dis=none) header.from=troutmask.apl.washington.edu Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="SwgxwTzH"; 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 43HVLS51JCz9s1c for ; Sun, 16 Dec 2018 14:35:58 +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:date :from:to:subject:message-id:reply-to:mime-version:content-type; q=dns; s=default; b=rRB27Gw450rFTear2ivRRuHRTHmSuE8AWNfpg5YWtkN PKjzJXCOWr0Nj67QuR2NiLW8gWtNtzWAQ+I6rSgkAJFdcp/h8MCQ6/dR622jWUJH Xm7cSavYCvQK7n6Oy8EhZ9g/urccjfqoSSAxmkUXuVzfXz8xW1deh+jBc/YTEZ/s = 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:date :from:to:subject:message-id:reply-to:mime-version:content-type; s=default; bh=UqApk6nIvhSlwlo/k9lc+Lux1k4=; b=SwgxwTzHC7qzsGkJZ ChxnQSXbEJPSgpSYXcw/RHoAu4rcMyKt3bsxtH1xonyzyzuh33zORCwrxhi+fvQh gPMIM2x2QbysOC1al/HHatQ/xAlR+pETaGEH3flDtevKUuucIKdZoaO5PN31Kwgu dYa13Ynti7cmg0r0nz/U2d5Lh0= Received: (qmail 72413 invoked by alias); 16 Dec 2018 03:35:43 -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 72388 invoked by uid 89); 16 Dec 2018 03:35:42 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-10.1 required=5.0 tests=BAYES_00, GIT_PATCH_2, GIT_PATCH_3, KAM_ASCII_DIVIDERS, KAM_LAZY_DOMAIN_SECURITY autolearn=ham version=3.3.2 spammy=removes, gfc_expr, EXPR_CONSTANT, expr_constant X-HELO: troutmask.apl.washington.edu Received: from troutmask.apl.washington.edu (HELO troutmask.apl.washington.edu) (128.95.76.21) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Sun, 16 Dec 2018 03:35:40 +0000 Received: from troutmask.apl.washington.edu (localhost [127.0.0.1]) by troutmask.apl.washington.edu (8.15.2/8.15.2) with ESMTPS id wBG3ZcF4014798 (version=TLSv1.3 cipher=TLS_AES_256_GCM_SHA384 bits=256 verify=NO); Sat, 15 Dec 2018 19:35:38 -0800 (PST) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.15.2/8.15.2/Submit) id wBG3Zctr014797; Sat, 15 Dec 2018 19:35:38 -0800 (PST) (envelope-from sgk) Date: Sat, 15 Dec 2018 19:35:38 -0800 From: Steve Kargl To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [Committed] PR fortran/87994 -- Inquiry parameter as data constant Message-ID: <20181216033538.GA14782@troutmask.apl.washington.edu> Reply-To: sgk@troutmask.apl.washington.edu MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.10.1 (2018-07-13) I've committed the attached after testing on i586-*-freebsd and x86_64-*-freebsd. It removes an ICE by allowing the inquiry parametes of len and kind in data statements as data constants. 2018-12-15 Steven G. Kargl PR fortran/87944 * decl.c (match_data_constant): Allow inquiry parameter as data constant in data statement. 2018-12-15 Steven G. Kargl PR fortran/87944 * gfortran.dg/pr87994_1.f90: New test. * gfortran.dg/pr87994_2.f90: Ditto. * gfortran.dg/pr87994_3.f90: Ditto. Index: gcc/fortran/decl.c =================================================================== --- gcc/fortran/decl.c (revision 267180) +++ gcc/fortran/decl.c (working copy) @@ -399,6 +399,14 @@ match_data_constant (gfc_expr **result) } else if (m == MATCH_YES) { + /* If a parameter inquiry ends up here, symtree is NULL but **result + contains the right constant expression. Check here. */ + if ((*result)->symtree == NULL + && (*result)->expr_type == EXPR_CONSTANT + && ((*result)->ts.type == BT_INTEGER + || (*result)->ts.type == BT_REAL)) + return m; + /* F2018:R845 data-stmt-constant is initial-data-target. A data-stmt-constant shall be ... initial-data-target if and only if the corresponding data-stmt-object has the POINTER Index: gcc/testsuite/gfortran.dg/pr87994_1.f90 =================================================================== --- gcc/testsuite/gfortran.dg/pr87994_1.f90 (nonexistent) +++ gcc/testsuite/gfortran.dg/pr87994_1.f90 (working copy) @@ -0,0 +1,7 @@ +! { dg-do run } +! PR fortran/87994 +program p + real :: a, b + data b /a%kind/ + if (b /= kind(a)) stop 1 +end Index: gcc/testsuite/gfortran.dg/pr87994_2.f90 =================================================================== --- gcc/testsuite/gfortran.dg/pr87994_2.f90 (nonexistent) +++ gcc/testsuite/gfortran.dg/pr87994_2.f90 (working copy) @@ -0,0 +1,7 @@ +! { dg-do run } +! PR fortran/87994 +program p + real, parameter :: a = 1.0 + data b /a%kind/ + if (b /= kind(a)) stop 1 +end Index: gcc/testsuite/gfortran.dg/pr87994_3.f90 =================================================================== --- gcc/testsuite/gfortran.dg/pr87994_3.f90 (nonexistent) +++ gcc/testsuite/gfortran.dg/pr87994_3.f90 (working copy) @@ -0,0 +1,8 @@ +! { dg-do run } +! PR fortran/87994 +program p + integer, parameter :: a = 1 + integer :: b + data b /a%kind/ + if (b /= kind(a)) stop = 1 +end