From patchwork Wed Jun 12 13:29:21 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Tobias Burnus X-Patchwork-Id: 250790 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 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client CN "localhost", Issuer "www.qmailtoaster.com" (not verified)) by ozlabs.org (Postfix) with ESMTPS id DCCC92C0099 for ; Wed, 12 Jun 2013 23:29:43 +1000 (EST) DomainKey-Signature: a=rsa-sha1; c=nofws; d=gcc.gnu.org; h=list-id :list-unsubscribe:list-archive:list-post:list-help:sender :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; q=dns; s=default; b=jSu/S6f3nCnL7z2di LsFXqxBu8GQGGgaT/yP7C5GocRqKK8NdTP4vn//7yHo5NLI9GnXySha9V/S8C54Y +AgDZJT+S69YR6HkHFcJExjvK2xyESA5uYRZKLSmSQgJZPPovjVhzW99drba482i IediMT8ecKI+bbnjrcZIAIfauY= 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 :message-id:date:from:mime-version:to:cc:subject:references :in-reply-to:content-type; s=default; bh=EbhpECw+3q3BCjh4l1PopDl bEX0=; b=pM7tjeHyX1TF7U4NLubdRfC/K9e5hiWQZj/FrncVgvn0uavirB7Df7T 27g0Ydna4wanXQx++ys45RMO7p8LGj+JnvA8YvrmxU+1Ccm2Ad+WirN+D6EdBJCz mTW9AEeYOdZ6gVuntlzlAgfdJf7xE50gXLTZZVnMbr/3++k8AJ/w= Received: (qmail 3634 invoked by alias); 12 Jun 2013 13:29:32 -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 3587 invoked by uid 89); 12 Jun 2013 13:29:25 -0000 X-Spam-SWARE-Status: No, score=-2.9 required=5.0 tests=AWL, BAYES_00, KHOP_THREADED, RCVD_IN_DNSWL_NONE autolearn=ham version=3.3.1 X-Spam-User: qpsmtpd, 2 recipients Received: from mx02.qsc.de (HELO mx02.qsc.de) (213.148.130.14) by sourceware.org (qpsmtpd/0.84/v0.84-167-ge50287c) with ESMTP; Wed, 12 Jun 2013 13:29:24 +0000 Received: from archimedes.net-b.de (port-92-195-31-211.dynamic.qsc.de [92.195.31.211]) by mx02.qsc.de (Postfix) with ESMTP id B9CDA27665; Wed, 12 Jun 2013 15:29:21 +0200 (CEST) Message-ID: <51B877B1.6040904@net-b.de> Date: Wed, 12 Jun 2013 15:29:21 +0200 From: Tobias Burnus User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/20130510 Thunderbird/17.0.6 MIME-Version: 1.0 To: Dominique Dhumieres CC: fortran@gcc.gnu.org, gcc-patches@gcc.gnu.org Subject: Re: *PING* / Re: [Patch, Fortran] Finalize nonallocatables with INTENT(out) References: <20130609104620.A97DF3BE1B@mailhost.lps.ens.fr> <51B87535.7030606@net-b.de> In-Reply-To: <51B87535.7030606@net-b.de> X-Virus-Found: No Tobias Burnus wrote: > Dominique Dhumieres wrote: >> I have tried to weaken the test by not using any target and using a >> regexp >> of the kind "(int|long)", but I did not succeeded. Ups, I missed that Dominique's and Andreas' 32bit dumps are different ("unsigned int" vs. "character(kind=4)"). Thus, the new pattern accepts either version. Committed as 200006. Tobias Index: gcc/testsuite/ChangeLog =================================================================== --- gcc/testsuite/ChangeLog (Revision 200003) +++ gcc/testsuite/ChangeLog (Arbeitskopie) @@ -1,7 +1,11 @@ 2013-06-12 Tobias Burnus + + * gfortran.dg/finalize_10.f90: Update scan-tree-dump. + +2013-06-12 Tobias Burnus Dominique d'Humieres - * gfortran.dg/finalize_10.f90: Update dg-dump. + * gfortran.dg/finalize_10.f90: Update scan-tree-dump. 2013-06-12 Jakub Jelinek Index: gcc/testsuite/gfortran.dg/finalize_10.f90 =================================================================== --- gcc/testsuite/gfortran.dg/finalize_10.f90 (Revision 200003) +++ gcc/testsuite/gfortran.dg/finalize_10.f90 (Arbeitskopie) @@ -26,7 +26,7 @@ ! Finalize CLASS + set default init ! { dg-final { scan-tree-dump-times "y->_vptr->_final \\(&desc.\[0-9\]+, y->_vptr->_size, 0\\);" 1 "original" } } -! { dg-final { scan-tree-dump "__builtin_memcpy \\(\\(void .\\) y->_data, \\(void .\\) y->_vptr->_def_init, \\(unsigned (long|int)\\) y->_vptr->_size\\);" "original" } } +! { dg-final { scan-tree-dump "__builtin_memcpy \\(\\(void .\\) y->_data, \\(void .\\) y->_vptr->_def_init, \\((unsigned long|unsigned int|character\\(kind=4\\))\\) y->_vptr->_size\\);" "original" } } ! { dg-final { scan-tree-dump-times "x->_vptr->_final \\(&x->_data, x->_vptr->_size, 0\\);" 1 "original" } } ! { dg-final { scan-tree-dump-times "x->_vptr->_copy \\(x->_vptr->_def_init, &x->_data\\);" 1 "original" } }