From: dfranke <dfranke@138bc75d-0d04-0410-961f-82ee72b054a4>
Date: Sun, 16 May 2010 20:01:06 +0000 (+0000)
Subject: gcc/fortran/:
X-Git-Url: http://git.sourceforge.jp/view?p=pf3gnuchains%2Fgcc-fork.git;a=commitdiff_plain;h=24ea0e181fb313d301d2baa61e7901408d0bee8b

gcc/fortran/:
2010-05-16  Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/35779
	* array.c (match_array_list): Revert functional change of 2010-05-13.

gcc/fortran/:
2010-05-16  Daniel Franke  <franke.daniel@gmail.com>

        PR fortran/35779
	* gfortran.dg/initialization_25.f90: Commented testcase.
	* gfortran.dg/initialization_26.f90: New.



git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@159465 138bc75d-0d04-0410-961f-82ee72b054a4
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index af8ce0a4949..8c5d7b103e7 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2010-05-16  Daniel Franke  <franke.daniel@gmail.com>
+
+        PR fortran/35779
+	* array.c (match_array_list): Revert change from 2010-05-13.
+
 2010-05-16  Richard Guenther  <rguenther@suse.de>
 
 	* trans-decl.c (module_htab_decls_hash): Revert last change.
diff --git a/gcc/fortran/array.c b/gcc/fortran/array.c
index 25c6e140306..3ffc39714da 100644
--- a/gcc/fortran/array.c
+++ b/gcc/fortran/array.c
@@ -879,7 +879,7 @@ match_array_list (gfc_constructor_base *result)
 
   for (n = 1;; n++)
     {
-      m = gfc_match_iterator (&iter, gfc_init_expr_flag);
+      m = gfc_match_iterator (&iter, 0);
       if (m == MATCH_YES)
 	break;
       if (m == MATCH_ERROR)
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 4ec703c03ad..2abe3965f0a 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,9 @@
+2010-05-16  Daniel Franke  <franke.daniel@gmail.com>
+
+        PR fortran/35779
+	* gfortran.dg/initialization_25.f90: Commented testcase.
+	* gfortran.dg/initialization_26.f90: New.
+
 2010-05-16  Richard Guenther  <rguenther@suse.de>
 
 	* gcc.dg/pr43317.c: Do not pass -fipa-type-escape.
diff --git a/gcc/testsuite/gfortran.dg/initialization_25.f90 b/gcc/testsuite/gfortran.dg/initialization_25.f90
index d6fab972c18..fc667f4485a 100644
--- a/gcc/testsuite/gfortran.dg/initialization_25.f90
+++ b/gcc/testsuite/gfortran.dg/initialization_25.f90
@@ -4,8 +4,9 @@
 ! Tescase contributed by
 ! Dick Hendrickson <dick DOT hendrickson AT gmail DOT com>
 !
+! Initial patch was reverted as it broke nested loops (see initialization_26.f90).
+!
 
-  INTEGER :: J1
-  INTEGER,PARAMETER :: I3(10) = (/(J1,J1=10,1,-1)/)
-  INTEGER,PARAMETER :: I2(10) = (/(J1,J1=its_bad,1,-1)/) ! { dg-error "does not reduce" }
+!   INTEGER :: J1
+!   INTEGER,PARAMETER :: I2(10) = (/(J1,J1=its_bad,1,-1)/) ! { dg - error "does not reduce" }
 END