From patchwork Thu Sep 8 20:00:14 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Thomas Koenig X-Patchwork-Id: 113934 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 11EA3B6F18 for ; Fri, 9 Sep 2011 06:00:43 +1000 (EST) Received: (qmail 20499 invoked by alias); 8 Sep 2011 20:00:38 -0000 Received: (qmail 20478 invoked by uid 22791); 8 Sep 2011 20:00:35 -0000 X-SWARE-Spam-Status: No, hits=-1.5 required=5.0 tests=AWL, BAYES_00, RCVD_IN_DNSWL_NONE, RP_MATCHES_RCVD X-Spam-Check-By: sourceware.org Received: from cc-smtpout2.netcologne.de (HELO cc-smtpout2.netcologne.de) (89.1.8.212) by sourceware.org (qpsmtpd/0.43rc1) with ESMTP; Thu, 08 Sep 2011 20:00:18 +0000 Received: from cc-smtpin2.netcologne.de (cc-smtpin2.netcologne.de [89.1.8.202]) by cc-smtpout2.netcologne.de (Postfix) with ESMTP id CD305124B4; Thu, 8 Sep 2011 22:00:16 +0200 (CEST) Received: from [192.168.0.197] (xdsl-78-35-153-174.netcologne.de [78.35.153.174]) by cc-smtpin2.netcologne.de (Postfix) with ESMTPSA id 8BD2811E84; Thu, 8 Sep 2011 22:00:15 +0200 (CEST) Message-ID: <4E691ECE.2060304@netcologne.de> Date: Thu, 08 Sep 2011 22:00:14 +0200 From: Thomas Koenig User-Agent: Mozilla/5.0 (X11; U; Linux x86_64; de; rv:1.9.2.17) Gecko/20110414 SUSE/3.1.10 Thunderbird/3.1.10 MIME-Version: 1.0 To: "fortran@gcc.gnu.org" , gcc-patches Subject: [patch, fortran] Further fixes for PR 49479 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 Hello world, this patch fixes the same kind of problems that PR 49479 addressed, by applying the same kind of fix to another class of function. I have not bothered to find a test case. Regression-tested. OK for trunk and (after a few days) for 4.6? Thomas 2011-09-08 Thomas Koenig PR fortran/49479 * generated/m4/ifunction.m4: Always call internal_malloc_size even when there is no return array. * generated/generated/maxloc1_16_i16.c: Regenerated. * generated/generated/maxloc1_16_i1.c: Regenerated. * generated/generated/maxloc1_16_i2.c: Regenerated. * generated/generated/maxloc1_16_i4.c: Regenerated. * generated/generated/maxloc1_16_i8.c: Regenerated. * generated/generated/maxloc1_16_r10.c: Regenerated. * generated/generated/maxloc1_16_r16.c: Regenerated. * generated/generated/maxloc1_16_r4.c: Regenerated. * generated/generated/maxloc1_16_r8.c: Regenerated. * generated/generated/maxloc1_4_i16.c: Regenerated. * generated/generated/maxloc1_4_i1.c: Regenerated. * generated/generated/maxloc1_4_i2.c: Regenerated. * generated/generated/maxloc1_4_i4.c: Regenerated. * generated/generated/maxloc1_4_i8.c: Regenerated. * generated/generated/maxloc1_4_r10.c: Regenerated. * generated/generated/maxloc1_4_r16.c: Regenerated. * generated/generated/maxloc1_4_r4.c: Regenerated. * generated/generated/maxloc1_4_r8.c: Regenerated. * generated/generated/maxloc1_8_i16.c: Regenerated. * generated/generated/maxloc1_8_i1.c: Regenerated. * generated/generated/maxloc1_8_i2.c: Regenerated. * generated/generated/maxloc1_8_i4.c: Regenerated. * generated/generated/maxloc1_8_i8.c: Regenerated. * generated/generated/maxloc1_8_r10.c: Regenerated. * generated/generated/maxloc1_8_r16.c: Regenerated. * generated/generated/maxloc1_8_r4.c: Regenerated. * generated/generated/maxloc1_8_r8.c: Regenerated. * generated/generated/maxval_i16.c: Regenerated. * generated/generated/maxval_i1.c: Regenerated. * generated/generated/maxval_i2.c: Regenerated. * generated/generated/maxval_i4.c: Regenerated. * generated/generated/maxval_i8.c: Regenerated. * generated/generated/maxval_r10.c: Regenerated. * generated/generated/maxval_r16.c: Regenerated. * generated/generated/maxval_r4.c: Regenerated. * generated/generated/maxval_r8.c: Regenerated. * generated/generated/minloc1_16_i16.c: Regenerated. * generated/generated/minloc1_16_i1.c: Regenerated. * generated/generated/minloc1_16_i2.c: Regenerated. * generated/generated/minloc1_16_i4.c: Regenerated. * generated/generated/minloc1_16_i8.c: Regenerated. * generated/generated/minloc1_16_r10.c: Regenerated. * generated/generated/minloc1_16_r16.c: Regenerated. * generated/generated/minloc1_16_r4.c: Regenerated. * generated/generated/minloc1_16_r8.c: Regenerated. * generated/generated/minloc1_4_i16.c: Regenerated. * generated/generated/minloc1_4_i1.c: Regenerated. * generated/generated/minloc1_4_i2.c: Regenerated. * generated/generated/minloc1_4_i4.c: Regenerated. * generated/generated/minloc1_4_i8.c: Regenerated. * generated/generated/minloc1_4_r10.c: Regenerated. * generated/generated/minloc1_4_r16.c: Regenerated. * generated/generated/minloc1_4_r4.c: Regenerated. * generated/generated/minloc1_4_r8.c: Regenerated. * generated/generated/minloc1_8_i16.c: Regenerated. * generated/generated/minloc1_8_i1.c: Regenerated. * generated/generated/minloc1_8_i2.c: Regenerated. * generated/generated/minloc1_8_i4.c: Regenerated. * generated/generated/minloc1_8_i8.c: Regenerated. * generated/generated/minloc1_8_r10.c: Regenerated. * generated/generated/minloc1_8_r16.c: Regenerated. * generated/generated/minloc1_8_r4.c: Regenerated. * generated/generated/minloc1_8_r8.c: Regenerated. * generated/generated/minval_i16.c: Regenerated. * generated/generated/minval_i1.c: Regenerated. * generated/generated/minval_i2.c: Regenerated. * generated/generated/minval_i4.c: Regenerated. * generated/generated/minval_i8.c: Regenerated. * generated/generated/minval_r10.c: Regenerated. * generated/generated/minval_r16.c: Regenerated. * generated/generated/minval_r4.c: Regenerated. * generated/generated/minval_r8.c: Regenerated. * generated/generated/product_c10.c: Regenerated. * generated/generated/product_c16.c: Regenerated. * generated/generated/product_c4.c: Regenerated. * generated/generated/product_c8.c: Regenerated. * generated/generated/product_i16.c: Regenerated. * generated/generated/product_i1.c: Regenerated. * generated/generated/product_i2.c: Regenerated. * generated/generated/product_i4.c: Regenerated. * generated/generated/product_i8.c: Regenerated. * generated/generated/product_r10.c: Regenerated. * generated/generated/product_r16.c: Regenerated. * generated/generated/product_r4.c: Regenerated. * generated/generated/product_r8.c: Regenerated. * generated/generated/sum_c10.c: Regenerated. * generated/generated/sum_c16.c: Regenerated. * generated/generated/sum_c4.c: Regenerated. * generated/generated/sum_c8.c: Regenerated. * generated/generated/sum_i16.c: Regenerated. * generated/generated/sum_i1.c: Regenerated. * generated/generated/sum_i2.c: Regenerated. * generated/generated/sum_i4.c: Regenerated. * generated/generated/sum_i8.c: Regenerated. * generated/generated/sum_r10.c: Regenerated. * generated/generated/sum_r16.c: Regenerated. * generated/generated/sum_r4.c: Regenerated. * generated/generated/sum_r8.c: Regenerated. Index: m4/ifunction.m4 =================================================================== --- m4/ifunction.m4 (Revision 178139) +++ m4/ifunction.m4 (Arbeitskopie) @@ -88,6 +88,7 @@ name`'rtype_qual`_'atype_code (rtype * const restr alloc_size = sizeof (rtype_name) * GFC_DESCRIPTOR_STRIDE(retarray,rank-1) * extent[rank-1]; + retarray->data = internal_malloc_size (alloc_size); if (alloc_size == 0) { /* Make sure we have a zero-sized array. */ @@ -95,8 +96,6 @@ name`'rtype_qual`_'atype_code (rtype * const restr return; } - else - retarray->data = internal_malloc_size (alloc_size); } else {