From patchwork Thu Nov 24 03:11:02 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Steve Kargl X-Patchwork-Id: 698591 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org 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 3tPPRc6t1Dz9snm for ; Thu, 24 Nov 2016 14:13:31 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=pass (1024-bit key; unprotected) header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b="hZp3nfdd"; dkim-atps=neutral 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:mime-version:content-type; q=dns; s= default; b=CS5aht+t6wez9v80ZetdW5fPawXm2nChM3nVSzdQbqYMyhIyPmriW 5Bx5PfdO6BOcpAV4QlBUjzfpqs4UWLo/S0DxZQ7ItZklGzsZQN6yfUU/4Eu6ZpaE vdmghoHAi1KW/oCfHBZkUeET7az/g8uuY9nkIq8DTUcwUfU3pKZoOI= 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:mime-version:content-type; s= default; bh=RatHC4iBi/ZVY+rHdcT9sN/EVuc=; b=hZp3nfddFYZn+oprJQbU PM+ewHkVtJvlPeOZM5KGmC4xfpN9Ebhi13eCbRZy6+Os0oBsoKq8adsMQQ1Hlzs3 qkInnzKTtl9c3jurCRlwLOB16A5an1GPc2fpa5D0gTANQRrnNNBmGTgoLO5RFP5C gReGwF74HgASZLqo195Gr4Y= Received: (qmail 93607 invoked by alias); 24 Nov 2016 03:11:52 -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 92862 invoked by uid 89); 24 Nov 2016 03:11:15 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL, BAYES_00, KAM_ASCII_DIVIDERS, KAM_LAZY_DOMAIN_SECURITY, RP_MATCHES_RCVD autolearn=ham version=3.3.2 spammy=1019, 101, 9, ofast, Ofast 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; Thu, 24 Nov 2016 03:11:05 +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 uAO3B2ur051169 (version=TLSv1.2 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO); Wed, 23 Nov 2016 19:11:02 -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 uAO3B21X051168; Wed, 23 Nov 2016 19:11:02 -0800 (PST) (envelope-from sgk) Date: Wed, 23 Nov 2016 19:11:02 -0800 From: Steve Kargl To: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: [PATCH] PR fortran/78279 -- convert assert to internal error Message-ID: <20161124031102.GA51147@troutmask.apl.washington.edu> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.6.1 (2016-04-27) The patch has passed regression testing on x86_64-*-freebsd. It should be self-explanatory. OK to commit? 2016-11-23 Steven G. Kargl PR fortran/78279 * dependency.c (identical_array_ref): Convert gcc_assert to conditional and gfc_internal_error. 2016-11-23 Steven G. Kargl PR fortran/78279 * gfortran.dg/pr78279.f90: New test. Index: gcc/fortran/dependency.c =================================================================== --- gcc/fortran/dependency.c (revision 242789) +++ gcc/fortran/dependency.c (working copy) @@ -101,7 +101,9 @@ identical_array_ref (gfc_array_ref *a1, if (a1->type == AR_ELEMENT && a2->type == AR_ELEMENT) { - gcc_assert (a1->dimen == a2->dimen); + if (a1->dimen != a2->dimen) + gfc_internal_error ("identical_array_ref(): inconsistent dimensions"); + for (i = 0; i < a1->dimen; i++) { if (gfc_dep_compare_expr (a1->start[i], a2->start[i]) != 0) Index: gcc/testsuite/gfortran.dg/pr78279.f90 =================================================================== --- gcc/testsuite/gfortran.dg/pr78279.f90 (nonexistent) +++ gcc/testsuite/gfortran.dg/pr78279.f90 (working copy) @@ -0,0 +1,10 @@ +! { dg-do compile } +! { dg-options "-Ofast" } +program p + integer :: i + real :: z(2,4) + z = 0.0 + do i = 1, 3 + if ( z(i) > z(1,i+1) ) print *, i ! { dg-error "mismatch in array reference" } + end do +end