From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 2777 invoked by alias); 16 Mar 2018 19:22:43 -0000 Mailing-List: contact fortran-help@gcc.gnu.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Post: List-Help: , Sender: fortran-owner@gcc.gnu.org Received: (qmail 2756 invoked by uid 89); 16 Mar 2018 19:22:42 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-9.4 required=5.0 tests=AWL,BAYES_00,GIT_PATCH_2,GIT_PATCH_3,KAM_ASCII_DIVIDERS,KAM_LAZY_DOMAIN_SECURITY,T_RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=sum X-Spam-User: qpsmtpd, 2 recipients 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; Fri, 16 Mar 2018 19:22:41 +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 w2GJMegw074337 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Fri, 16 Mar 2018 12:22:40 -0700 (PDT) (envelope-from sgk@troutmask.apl.washington.edu) Received: (from sgk@localhost) by troutmask.apl.washington.edu (8.15.2/8.15.2/Submit) id w2GJMedi074336; Fri, 16 Mar 2018 12:22:40 -0700 (PDT) (envelope-from sgk) Date: Fri, 16 Mar 2018 19:22:00 -0000 From: Steve Kargl To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [Committed] PR fortran/69395 -- Correct error condition Message-ID: <20180316192239.GA74316@troutmask.apl.washington.edu> Reply-To: sgk@troutmask.apl.washington.edu MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline User-Agent: Mutt/1.9.2 (2017-12-15) X-IsSubscribed: yes X-SW-Source: 2018-03/txt/msg00089.txt.bz2 The following patch fixes essentially and off-by-one in the error condition. Committed as obvious. 2018-03-16 Steven G. Kargl PR fortran/69395 * decl.c (merge_array_spec): Correct the error condition. 2018-03-16 Steven G. Kargl PR fortran/69395 * gfortran.dg/pr69395.f90: Add test for max dimensions Index: gcc/fortran/decl.c =================================================================== --- gcc/fortran/decl.c (revision 258581) +++ gcc/fortran/decl.c (working copy) @@ -871,7 +871,7 @@ merge_array_spec (gfc_array_spec *from, gfc_array_spec } } - if (to->rank + to->corank >= GFC_MAX_DIMENSIONS) + if (to->rank + to->corank > GFC_MAX_DIMENSIONS) { gfc_error ("Sum of array rank %d and corank %d at %C exceeds maximum " "allowed dimensions of %d", Index: gcc/testsuite/gfortran.dg/pr69395.f90 =================================================================== --- gcc/testsuite/gfortran.dg/pr69395.f90 (revision 258580) +++ gcc/testsuite/gfortran.dg/pr69395.f90 (working copy) @@ -1,5 +1,6 @@ ! { dg-do compile } ! { dg-options "-fcoarray=single" } program p +real, dimension(1,2,1,2,1,2,1,2), codimension[1,2,1,2,1,2,*] :: y real, dimension(1,2,1,2,1,2,1,2), codimension[1,2,1,2,1,2,1,*] :: z ! { dg-error "allowed dimensions" } end -- Steve