From patchwork Sat Jul 21 10:10:36 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 172417 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 007A32C0327 for ; Sat, 21 Jul 2012 20:10:59 +1000 (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=1343470260; h=Comment: DomainKey-Signature:Received:Received:Received:Received: Message-ID:Date:From:User-Agent:MIME-Version:To:Subject: Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe: List-Archive:List-Post:List-Help:Sender:Delivered-To; bh=vo4FLv+ PPOdnb/LSJNWEycrOdiA=; b=o0Unjh4zvipshwkGCy8BXBVSjtojOETE0Qek+Aa XsEOtWjypBmrkFXOv8mP/TBW6M1eT4WoeSK9V3YjEvq4uemD3PbjRdLECuCXzbWw X/TL2ilhMNXucpLd6qjP6iyPfbVuVVCptiIT7tzO0qvI8nbsKYQzv/l+UfxGlH02 dVpA= 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:Message-ID:Date:From:User-Agent:MIME-Version:To:Subject:Content-Type:Mailing-List:Precedence:List-Id:List-Unsubscribe:List-Archive:List-Post:List-Help:Sender:Delivered-To; b=vJhRur4RZNBAYiC4wIbsLi0lVKAvvZQIfHlHT7KHntkWLU1DtKKghWKglMSnOX UkSYRF3A1/pg6gqdzeQAyH5BjvGlYaKNE3qGzf9Ez94YNjtWiDaDw7aaSbfOgC6+ s+mUnKTrXTQomzJQEZFrJb6koSq7rKSwwKQCuRANHzU6Q=; Received: (qmail 7919 invoked by alias); 21 Jul 2012 10:10:51 -0000 Received: (qmail 7899 invoked by uid 22791); 21 Jul 2012 10:10:50 -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 mx01.qsc.de (HELO mx01.qsc.de) (213.148.129.14) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Sat, 21 Jul 2012 10:10:38 +0000 Received: from [192.168.178.22] (port-92-204-53-225.dynamic.qsc.de [92.204.53.225]) by mx01.qsc.de (Postfix) with ESMTP id EE2983CF74; Sat, 21 Jul 2012 12:10:36 +0200 (CEST) Message-ID: <500A801C.90209@net-b.de> Date: Sat, 21 Jul 2012 12:10:36 +0200 From: Tobias Burnus User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:13.0) Gecko/20120614 Thunderbird/13.0.1 MIME-Version: 1.0 To: gcc patches , gfortran Subject: [Patch, Fortran, committed] Another C++ism + Fortran-dev update 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 I build the Fortran-dev branch with C, and it failed because of the previous Boolean issue, but also because decl-ordering issue, addressed by the attachment. I initially thought that the latter is a merge issue, but as it isn't, I have now fixed it first on the trunk – and then backported the fix to the Fortran-dev branch. Trunk commit: Rev. 189740. Fortran-branch: Rev. 189741. Tobias Index: gcc/fortran/resolve.c =================================================================== --- gcc/fortran/resolve.c (Revision 189738) +++ gcc/fortran/resolve.c (Arbeitskopie) @@ -257,9 +257,10 @@ resolve_formal_arglist (gfc_symbol *proc) for (f = proc->formal; f; f = f->next) { - sym = f->sym; gfc_array_spec *as; + sym = f->sym; + if (sym == NULL) { /* Alternate return placeholder. */ Index: gcc/fortran/ChangeLog =================================================================== --- gcc/fortran/ChangeLog (Revision 189739) +++ gcc/fortran/ChangeLog (Arbeitskopie) @@ -1,5 +1,10 @@ 2012-07-21 Tobias Burnus + * resolve.c (resolve_formal_arglist): Put variable + declaration before the first assignment. + +2012-07-21 Tobias Burnus + * trans-expr.c (gfc_conv_derived_to_class): Fix argument passed to class_array_data_assign.