re PR fortran/71795 (Two Bugs in array constructors (optimization))

2016-07-22  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/71795
	* frontend-passes.c (combine_array_constructor):  Don't
	do anything if the expression is inside an array iterator.

2016-07-22  Thomas Koenig  <tkoenig@gcc.gnu.org>

	PR fortran/71795
	* gfortran.dg/constructor_50.f90:  New test.

From-SVN: r238638

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 54f87d474c1899dae18a1e3279f2dade9d65db47..ff12b56ec2e350bc137c001cf6e3eb76d2a81d5c 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,9 @@
+2016-07-22  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/71795
+       * frontend-passes.c (combine_array_constructor):  Don't
+       do anything if the expression is inside an array iterator.
+
 2016-07-22  Andre Vehreschild  <vehre@gcc.gnu.org>
 
        * expr.c (gfc_find_stat_co): Fixed whitespaces.

diff --git a/gcc/fortran/frontend-passes.c b/gcc/fortran/frontend-passes.c
index d4dee47ab75b14461bf367de05d065364561883b..d333c6882a46bd0f94a28bd9564d454de75201d5 100644 (file)
--- a/gcc/fortran/frontend-passes.c
+++ b/gcc/fortran/frontend-passes.c
@@ -1255,6 +1255,11 @@ combine_array_constructor (gfc_expr *e)
   if (forall_level > 0)
     return false;
 
+  /* Inside an iterator, things can get hairy; we are likely to create
+     an invalid temporary variable.  */
+  if (iterator_level > 0)
+    return false;
+
   op1 = e->value.op.op1;
   op2 = e->value.op.op2;
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 656a6c23ddafa1114b5a54b5e4c5f51e7d3ceb7f..feb3236fef92d4084a2b620d1bfd3d07162893d2 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2016-07-22  Thomas Koenig  <tkoenig@gcc.gnu.org>
+
+       PR fortran/71795
+       * gfortran.dg/constructor_50.f90:  New test.
+
 2016-07-22  Martin Liska  <mliska@suse.cz>
 
        PR gcov-profile/69028

diff --git a/gcc/testsuite/gfortran.dg/array_constructor_50.f90 b/gcc/testsuite/gfortran.dg/array_constructor_50.f90
new file mode 100644 (file)
index 0000000..c22c980
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/array_constructor_50.f90
@@ -0,0 +1,21 @@
+! { dg-do run }
+! PR 71795 - wrong result when putting an array constructor
+! instide an iterator.
+     program test
+
+     implicit none
+     integer :: i,n
+     logical, dimension(1) :: ra
+     logical :: rs
+     integer, allocatable :: a(:)
+
+     allocate ( a(1) )
+
+     n = 1
+     a = 2
+
+     ra = (/ (any(a(i).eq.(/1,2,3/)) ,i=1,n) /)
+     if (.not. all(ra)) call abort
+     rs = any ( (/ (any(a(i).eq.(/1,2,3/)) ,i=1,n) /) )
+     if (.not. rs) call abort
+   end program test