Patchwork *PING* / Re: [Patch, Fortran] Finalize nonallocatables with INTENT(out)

login
register
mail settings
Submitter Tobias Burnus
Date June 12, 2013, 1:18 p.m.
Message ID <51B87535.7030606@net-b.de>
Download mbox | patch
Permalink /patch/250779/
State New
Headers show

Comments

Tobias Burnus - June 12, 2013, 1:18 p.m.
Thanks Dominique and Andreas for reporting this issue.

Dominique Dhumieres wrote:
> The test gfortran.dg/finalize_10.f90 fails in 32 bit mode [...]
> The following patch fixes it
> [...]
>   
> 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.

Seemingly, dg-tree-dump-times does not work with regular expressions. I 
have replaces it by dg-tree-dump + regular expression.

Committed as 200003.

Tobias

Patch

Index: gcc/testsuite/ChangeLog
===================================================================
--- gcc/testsuite/ChangeLog	(Revision 200002)
+++ gcc/testsuite/ChangeLog	(Arbeitskopie)
@@ -1,3 +1,8 @@ 
+2013-06-12  Tobias Burnus  <burnus@net-b.de>
+	    Dominique d'Humieres  <dominiq@lps.ens.fr>
+
+	* gfortran.dg/finalize_10.f90: Update dg-dump.
+
 2013-06-12  Jakub Jelinek  <jakub@redhat.com>
 
 	PR target/56564
Index: gcc/testsuite/gfortran.dg/finalize_10.f90
===================================================================
--- gcc/testsuite/gfortran.dg/finalize_10.f90	(Revision 200002)
+++ 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-times "__builtin_memcpy \\(\\(void .\\) y->_data, \\(void .\\) y->_vptr->_def_init, \\(unsigned long\\) y->_vptr->_size\\);" 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-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" } }