From patchwork Wed Apr 20 18:12:00 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 92265 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 86B62B6F68 for ; Thu, 21 Apr 2011 04:12:20 +1000 (EST) Received: (qmail 12905 invoked by alias); 20 Apr 2011 18:12:17 -0000 Received: (qmail 12890 invoked by uid 22791); 20 Apr 2011 18:12:16 -0000 X-SWARE-Spam-Status: No, hits=-1.8 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE X-Spam-Check-By: sourceware.org Received: from mx02.qsc.de (HELO mx02.qsc.de) (213.148.130.14) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Wed, 20 Apr 2011 18:12:02 +0000 Received: from [192.168.178.22] (port-92-204-35-9.dynamic.qsc.de [92.204.35.9]) by mx02.qsc.de (Postfix) with ESMTP id AE43E1D8F4; Wed, 20 Apr 2011 20:12:00 +0200 (CEST) Message-ID: <4DAF21F0.9010705@net-b.de> Date: Wed, 20 Apr 2011 20:12:00 +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 48692 - Fix gfortran.dg/module_write_1.f90 failure 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 committal of the patch for PR 48588 caused that gfortran.dg/module_write_1.f90 was now failing (ICE). After some debugging (cf. PR 48692) it turned out that it only worked by chance before. The attached patch fixes the issue more properly. (The ICE occurred as a check whether all symbols were committed failed.) The patch was build, tested and regtested on x86-64-linux; it is rather obvious and has also been approved by Steve in a private email. Tobias Index: gcc/fortran/ChangeLog =================================================================== --- gcc/fortran/ChangeLog (Revision 172781) +++ gcc/fortran/ChangeLog (Arbeitskopie) @@ -1,3 +1,10 @@ +2011-04-19 Tobias Burnus + + PR fortran/48588 + PR fortran/48692 + + * module.c (fix_mio_expr): Commit created symbol. + 2011-04-19 Janne Blomqvist * scanner.c (load_file): Use XCNEWVAR instead of xcalloc. Index: gcc/fortran/module.c =================================================================== --- gcc/fortran/module.c (Revision 172781) +++ gcc/fortran/module.c (Arbeitskopie) @@ -3013,6 +3013,7 @@ fix_mio_expr (gfc_expr *e) sym->attr.flavor = FL_PROCEDURE; sym->attr.generic = 1; e->symtree = gfc_find_symtree (gfc_current_ns->sym_root, fname); + gfc_commit_symbol (sym); } }