From patchwork Tue Apr 7 14:11:52 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Andre Vehreschild X-Patchwork-Id: 458683 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]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ozlabs.org (Postfix) with ESMTPS id 79AFE14008F for ; Wed, 8 Apr 2015 00:12:16 +1000 (AEST) Authentication-Results: ozlabs.org; dkim=pass reason="1024-bit key; unprotected key" header.d=gcc.gnu.org header.i=@gcc.gnu.org header.b=NcxDqtQ0; dkim-adsp=none (unprotected policy); dkim-atps=neutral DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type; q=dns; s=default; b=O5LhUgeWw2Mc2d7U BhIPkrMwD61llv5t6chnw0maI1g4nonT5rFVI7zaMqEICf+6e0SjNikRb24N/V5s AlDqiweE+CXGNVnpJn8/yG5gPXegwzaYyl3ZLKQINpcdpqZ3+tYfE2lp75yIBxI+ EpYbols0pDQW2gPZOntcI1zL2R4= DKIM-Signature: v=1; a=rsa-sha1; c=relaxed; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender:date :from:to:cc:subject:message-id:in-reply-to:references :mime-version:content-type; s=default; bh=4zwJslXk9o8oJo6e4X2fJ7 R0PJw=; b=NcxDqtQ0zgC40yV23jjPmRIrigU+m7tE6iIvqTNlLdW/+3fSxVVKo1 QmqufzafM2Aiwszvqp2pnhcGUyeWsD6pEy7OWfZzcr+t/4T/83CpGZL8cMa/riXj qvC6CQOBYJCBBcg2vegWV4iB/Pv2JobEbeC857g69lN7KSgbn136M= Received: (qmail 68951 invoked by alias); 7 Apr 2015 14:12:03 -0000 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 Received: (qmail 68932 invoked by uid 89); 7 Apr 2015 14:12:02 -0000 Authentication-Results: sourceware.org; auth=none X-Virus-Found: No X-Spam-SWARE-Status: No, score=-1.4 required=5.0 tests=AWL, BAYES_00, FREEMAIL_FROM, KAM_ASCII_DIVIDERS, RCVD_IN_DNSWL_NONE, SPF_PASS autolearn=no version=3.3.2 X-Spam-User: qpsmtpd, 2 recipients X-HELO: mout.gmx.net Received: from mout.gmx.net (HELO mout.gmx.net) (212.227.15.18) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with (AES256-GCM-SHA384 encrypted) ESMTPS; Tue, 07 Apr 2015 14:12:01 +0000 Received: from vepi2 ([88.75.104.20]) by mail.gmx.com (mrgmx001) with ESMTPSA (Nemesis) id 0Mdafs-1Z4jos0iFA-00PPhO; Tue, 07 Apr 2015 16:11:54 +0200 Date: Tue, 7 Apr 2015 16:11:52 +0200 From: Andre Vehreschild To: Jerry DeLisle Cc: GCC-Patches-ML , GCC-Fortran-ML , Dominique Dhumieres Subject: Re: [Ping, Patch, fortran, pr65548, v1] [5 Regression] gfc_conv_procedure_call Message-ID: <20150407161152.22629ff5@vepi2> In-Reply-To: <551DD96F.2050706@charter.net> References: <20150325143554.0343a7a7@vepi2> <20150402122830.4153db9b@vepi2> <551DD96F.2050706@charter.net> MIME-Version: 1.0 X-UI-Out-Filterresults: notjunk:1; Hi Jerry, hi all, thank you for the review. Commited as r221897. Regards, Andre On Thu, 02 Apr 2015 17:06:07 -0700 Jerry DeLisle wrote: > On 04/02/2015 03:28 AM, Andre Vehreschild wrote: > > Ping! > > > > This should be in 5.1. Dominique and I feel like this patch is nearly > > obvious. > > > > Regards, > > Andre > > > > On Wed, 25 Mar 2015 14:35:54 +0100 > > Andre Vehreschild wrote: > > > >> Hi all, > >> > >> please find attached a fix for the recently introduced regression when > >> allocating arrays with an intrinsic function for source=. The patch > >> addresses this issue by using gfc_conv_expr_descriptor () for intrinsic > >> functions. > >> > >> Bootstraps and regtests ok on x86_64-linux-gnu/F20. > >> > >> Ok for trunk? > > Yes, ok for trunk. > > Thanks, > > Jerry > Index: gcc/fortran/ChangeLog =================================================================== --- gcc/fortran/ChangeLog (Revision 221896) +++ gcc/fortran/ChangeLog (Arbeitskopie) @@ -1,3 +1,9 @@ +2015-04-07 Andre Vehreschild + + PR fortran/65548 + * trans-stmt.c (gfc_trans_allocate): For intrinsic functions + use conv_expr_descriptor() instead of conv_expr_reference(). + 2015-03-30 Jakub Jelinek PR fortran/65597 Index: gcc/fortran/trans-stmt.c =================================================================== --- gcc/fortran/trans-stmt.c (Revision 221896) +++ gcc/fortran/trans-stmt.c (Arbeitskopie) @@ -5049,12 +5049,17 @@ /* In all other cases evaluate the expr3 and create a temporary. */ gfc_init_se (&se, NULL); - gfc_conv_expr_reference (&se, code->expr3); + if (code->expr3->rank != 0 + && code->expr3->expr_type == EXPR_FUNCTION + && code->expr3->value.function.isym) + gfc_conv_expr_descriptor (&se, code->expr3); + else + gfc_conv_expr_reference (&se, code->expr3); if (code->expr3->ts.type == BT_CLASS) gfc_conv_class_to_class (&se, code->expr3, code->expr3->ts, false, true, - false,false); + false, false); gfc_add_block_to_block (&block, &se.pre); gfc_add_block_to_block (&post, &se.post); /* Prevent aliasing, i.e., se.expr may be already a Index: gcc/testsuite/ChangeLog =================================================================== --- gcc/testsuite/ChangeLog (Revision 221896) +++ gcc/testsuite/ChangeLog (Arbeitskopie) @@ -1,3 +1,8 @@ +2015-04-07 Andre Vehreschild + + PR fortran/65548 + * gfortran.dg/allocate_with_source_5.f90: New test. + 2015-04-07 Ilya Enkovich * gcc.target/i386/mpx/chkp-thunk-comdat-1.cc: New. Index: gcc/testsuite/gfortran.dg/allocate_with_source_5.f90 =================================================================== --- gcc/testsuite/gfortran.dg/allocate_with_source_5.f90 (Revision 0) +++ gcc/testsuite/gfortran.dg/allocate_with_source_5.f90 (Arbeitskopie) @@ -0,0 +1,52 @@ +! { dg-do run } +! +! Check that pr65548 is fixed. +! Contributed by Juergen Reuter + +module allocate_with_source_5_module + + type :: selector_t + integer, dimension(:), allocatable :: map + real, dimension(:), allocatable :: weight + contains + procedure :: init => selector_init + end type selector_t + +contains + + subroutine selector_init (selector, weight) + class(selector_t), intent(out) :: selector + real, dimension(:), intent(in) :: weight + real :: s + integer :: n, i + logical, dimension(:), allocatable :: mask + s = sum (weight) + allocate (mask (size (weight)), source = weight /= 0) + n = count (mask) + if (n > 0) then + allocate (selector%map (n), & + source = pack ([(i, i = 1, size (weight))], mask)) + allocate (selector%weight (n), & + source = pack (weight / s, mask)) + else + allocate (selector%map (1), source = 1) + allocate (selector%weight (1), source = 0.) + end if + end subroutine selector_init + +end module allocate_with_source_5_module + +program allocate_with_source_5 + use allocate_with_source_5_module + + class(selector_t), allocatable :: sel; + real, dimension(5) :: w = [ 1, 0, 2, 0, 3]; + + allocate (sel) + call sel%init(w) + + if (any(sel%map /= [ 1, 3, 5])) call abort() + if (any(abs(sel%weight - [1, 2, 3] / 6) < 1E-6)) call abort() +end program allocate_with_source_5 +! { dg-final { cleanup-modules "allocate_with_source_5_module" } } +