From patchwork Fri Apr 15 21:44:52 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 91443 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]) by ozlabs.org (Postfix) with SMTP id 8F10EB6FD2 for ; Sat, 16 Apr 2011 07:45:41 +1000 (EST) Received: (qmail 15026 invoked by alias); 15 Apr 2011 21:45:40 -0000 Received: (qmail 15006 invoked by uid 22791); 15 Apr 2011 21:45:37 -0000 X-SWARE-Spam-Status: No, hits=-1.0 required=5.0 tests=AWL, BAYES_00, KAM_STOCKGEN, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from mx01.qsc.de (HELO mx01.qsc.de) (213.148.129.14) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Fri, 15 Apr 2011 21:44:55 +0000 Received: from [192.168.178.22] (port-92-204-66-174.dynamic.qsc.de [92.204.66.174]) by mx01.qsc.de (Postfix) with ESMTP id 52E273CBB8; Fri, 15 Apr 2011 23:44:53 +0200 (CEST) Message-ID: <4DA8BC54.2060205@net-b.de> Date: Fri, 15 Apr 2011 23:44:52 +0200 From: Tobias Burnus User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; de; rv:1.9.2.13) Gecko/20101206 SUSE/3.1.7 Thunderbird/3.1.7 MIME-Version: 1.0 To: gcc patches , gfortran Subject: [Patch, Fortran, committed] PR 18918 - Minor coarray fix 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 The attached patch fixes an ICE for scalar coarray with -fcoarray=lib. Additionally, I have change the dg-do compile into a run, which I forgot to do when initially submitting the patch. Committed as Rev. 172522. Tobias PS: All coarray*.f90 dg-do run test also work with "-fcoarray=lib -lcaf_single". Index: gcc/testsuite/gfortran.dg/coarray_15.f90 =================================================================== --- gcc/testsuite/gfortran.dg/coarray_15.f90 (Revision 172521) +++ gcc/testsuite/gfortran.dg/coarray_15.f90 (Arbeitskopie) @@ -1,4 +1,4 @@ -! { dg-do compile } +! { dg-do run } ! { dg-options "-fcoarray=single" } ! ! PR fortran/18918 Index: gcc/testsuite/ChangeLog =================================================================== --- gcc/testsuite/ChangeLog (Revision 172521) +++ gcc/testsuite/ChangeLog (Arbeitskopie) @@ -1,3 +1,8 @@ +2011-04-15 Tobias Burnus + + PR fortran/18918 + * gfortran.dg/coarray_15.f90: Change to dg-do run. + 2011-04-15 Nicola Pero * objc.dg/naming-4.m: Updated. Index: gcc/fortran/ChangeLog =================================================================== --- gcc/fortran/ChangeLog (Revision 172521) +++ gcc/fortran/ChangeLog (Arbeitskopie) @@ -1,3 +1,9 @@ +2011-04-15 Tobias Burnus + + PR fortran/18918 + * trans-intrinsic.c (conv_intrinsic_cobound): Remove unused + code which is also causing an ICE. + 2011-04-14 Nathan Froyd * f95-lang.c (poplevel): Use BLOCK_CHAIN and block_chainon. Index: gcc/fortran/trans-intrinsic.c =================================================================== --- gcc/fortran/trans-intrinsic.c (Revision 172521) +++ gcc/fortran/trans-intrinsic.c (Arbeitskopie) @@ -1129,7 +1129,6 @@ gfc_ss *ss; tree bound, resbound, resbound2, desc, cond, tmp; tree type; - gfc_array_spec * as; int corank; gcc_assert (expr->value.function.isym->id == GFC_ISYM_LCOBOUND @@ -1142,9 +1141,6 @@ gcc_assert (arg->expr->expr_type == EXPR_VARIABLE); corank = gfc_get_corank (arg->expr); - as = gfc_get_full_arrayspec_from_expr (arg->expr); - gcc_assert (as); - ss = gfc_walk_expr (arg->expr); gcc_assert (ss != gfc_ss_terminator); ss->data.info.codimen = corank;