From patchwork Tue Feb 19 16:48:38 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Mikael Morin X-Patchwork-Id: 221732 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 8449A2C0089 for ; Wed, 20 Feb 2013 03:52:23 +1100 (EST) Comment: DKIM? See http://www.dkim.org DKIM-Signature: v=1; a=rsa-sha1; c=relaxed/relaxed; d=gcc.gnu.org; s=default; x=1361897544; h=Comment: DomainKey-Signature:Received:Received:Received:Received:Received: MIME-Version:From:To:Message-ID:In-Reply-To:References: User-Agent:Subject:Date:Content-Type:Mailing-List:Precedence: List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender: Delivered-To; bh=9oQcEyxh6uR1aRUKQ1WmcOBPOJ4=; b=NeAlw+JXzMVsC4V p/wOY+qGr+3OVuNvt76RSwfZbW1HXAcqXMLmca4GJ2GErppZM4E9AkTjKlGzsbZo rTrQZCbtu6CoFXqdV5d0Ejzd3m7Xv4Pr7TZZ4N3by2jbGwAn70qEqazYl4NP+5td gqckPCF+UqTwuGV0tpYcxANk1hzc= Comment: DomainKeys? See http://antispam.yahoo.com/domainkeys DomainKey-Signature: a=rsa-sha1; q=dns; c=nofws; s=default; d=gcc.gnu.org; h=Received:Received:X-SWARE-Spam-Status:X-Spam-Check-By:Received:Received:Received:X-SFR-UUID:MIME-Version:From:To:Message-ID:In-Reply-To:References:User-Agent:Subject:Date:Content-Type:X-IsSubscribed:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=jgdhf1oDaUzWOSO6+Xno9MhiTCj0bBOkL7Divv+G04QbYKZ/x43bx1m0OxmfDh ciZ2pgAPeA95V6juj/puQuQEDm+AwkcrsSKt5UCZp7hEAUwOcCOnbf8cBJc1Pjis NcT9/R1MaV59UQ+5DBbdYYfvglFbeBWFhYJYJ4D5gw16A=; Received: (qmail 26646 invoked by alias); 19 Feb 2013 16:49:01 -0000 Received: (qmail 26339 invoked by uid 22791); 19 Feb 2013 16:48:51 -0000 X-SWARE-Spam-Status: No, hits=-2.6 required=5.0 tests=AWL, BAYES_00, KHOP_RCVD_UNTRUST, KHOP_THREADED, RCVD_IN_DNSWL_LOW, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from smtp21.services.sfr.fr (HELO smtp21.services.sfr.fr) (93.17.128.3) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Tue, 19 Feb 2013 16:48:40 +0000 Received: from filter.sfr.fr (localhost [127.0.0.1]) by msfrf2112.sfr.fr (SMTP Server) with ESMTP id 457717000137; Tue, 19 Feb 2013 17:48:39 +0100 (CET) Received: from [192.168.1.58] (94.15.72.86.rev.sfr.net [86.72.15.94]) by msfrf2112.sfr.fr (SMTP Server) with ESMTP id 06B257000136; Tue, 19 Feb 2013 17:48:38 +0100 (CET) X-SFR-UUID: 20130219164839275.06B257000136@msfrf2112.sfr.fr MIME-Version: 1.0 From: Mikael Morin To: gfortran , GCC patches Message-ID: <20130219164838.30845.15445@marvin> In-Reply-To: <20130219164810.30845.97901@marvin> References: <20130219164810.30845.97901@marvin> User-Agent: patchspam.py Subject: [Patch, fortran] [5/5] PR54730 ICE: confused by type-like fonctions: Fix gfc_match_array_constructor. Date: Tue, 19 Feb 2013 17:48:38 +0100 (CET) X-IsSubscribed: yes 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 This is the fix for the PR. 2013-02-15 Mikael Morin PR fortran/54730 * array.c (gfc_match_array_constructor): Set a checkpoint before matching a typespec. Drop it on success, restore it otherwise. 2013-02-15 Mikael Morin PR fortran/54730 * gfortran.dg/array_constructor_42.f90: New test. diff --git a/array.c b/array.c index 6787c05..b4a028b 100644 --- a/array.c +++ b/array.c @@ -1046,6 +1046,7 @@ match gfc_match_array_constructor (gfc_expr **result) { gfc_constructor_base head, new_cons; + gfc_change_set changed_syms; gfc_expr *expr; gfc_typespec ts; locus where; @@ -1074,6 +1075,7 @@ gfc_match_array_constructor (gfc_expr **result) /* Try to match an optional "type-spec ::" */ gfc_clear_ts (&ts); + gfc_new_checkpoint (changed_syms); if (gfc_match_decl_type_spec (&ts, 0) == MATCH_YES) { seen_ts = (gfc_match (" ::") == MATCH_YES); @@ -1082,19 +1084,28 @@ gfc_match_array_constructor (gfc_expr **result) { if (gfc_notify_std (GFC_STD_F2003, "Array constructor " "including type specification at %C") == FAILURE) - goto cleanup; + { + gfc_restore_last_checkpoint (); + goto cleanup; + } if (ts.deferred) { gfc_error ("Type-spec at %L cannot contain a deferred " "type parameter", &where); + gfc_restore_last_checkpoint (); goto cleanup; } } } - if (! seen_ts) - gfc_current_locus = where; + if (seen_ts) + gfc_drop_last_checkpoint (); + else + { + gfc_restore_last_checkpoint (); + gfc_current_locus = where; + } if (gfc_match (end_delim) == MATCH_YES) {