re PR fortran/32867 (ICE on nested initialization expressions)

gcc/fortran:
2007-07-24  Daniel Franke  <franke.daniel@gmail.com>

	PR fortran/32867
	* expr.c (check_init_expr): Simplify matched functions.

gcc/testsuite:
2007-07-24  Daniel Franke  <franke.daniel@gmail.com>

	PR fortran/32867
	* fortran.dg/initialization_10.f90: New test.

From-SVN: r126882

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 6445cf1f5055fab671596b4c7aa1d43bb917dff3..62489c868630c7143125562c3516879ea386eccb 100644 (file)
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-24  Daniel Franke  <franke.daniel@gmail.com>
+
+       PR fortran/32867
+       * expr.c (check_init_expr): Simplify matched functions.
+
 2007-07-24  Daniel Franke  <franke.daniel@gmail.com>
 
        PR fortran/32778

diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 0028724904153108f9a124af871bc761cdf153bf..8e608ed615b9a74e0da84474ea8f2b0a4e0c75b5 100644 (file)
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -2132,7 +2132,7 @@ check_init_expr (gfc_expr *e)
        }
 
       if (m == MATCH_YES)
-       t = SUCCESS;
+       t = gfc_simplify_expr (e, 0);
 
       break;
 

diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 1a75a1f5bb72a884e179810e9b17bda682a3c241..3b36d6a542459019fd5a488fbf1e21dcdf1543ec 100644 (file)
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2007-07-24  Daniel Franke  <franke.daniel@gmail.com>
+
+       PR fortran/32867
+       * fortran.dg/initialization_10.f90: New test.
+
 2007-07-24  Daniel Franke  <franke.daniel@gmail.com>
 
        PR fortran/32778

diff --git a/gcc/testsuite/gfortran.dg/initialization_10.f90 b/gcc/testsuite/gfortran.dg/initialization_10.f90
new file mode 100644 (file)
index 0000000..92d9df5
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/initialization_10.f90
@@ -0,0 +1,32 @@
+! { dg-do compile }
+!
+! PR fortran/32867 - nested initialization expression not simplified
+!
+! Testcase contributed by H. J. Lu <hjl AT lucon DOT org>
+!
+
+MODULE Readdata_mod
+IMPLICIT NONE
+Private
+Public Parser
+  integer, parameter :: nkeywords = 2
+character(80), PARAMETER, dimension(1:nkeywords) :: keywords = &
+(/'PROBLEMSIZE                                  ',             &
+  'NFTRANS_TD                                   '/)
+
+CONTAINS
+SUBROUTINE Parser(nx, ny, keyword)
+integer, intent(inout) :: nx, ny
+character(80), intent(inout) :: keyword
+
+select case (keyword)
+  case (trim(keywords(1))) ! PROBLEMSIZE
+    nx = 1
+  case (trim(keywords(2))) !'NFTRANS_TD'
+    ny = 1
+end select
+
+END SUBROUTINE Parser
+END MODULE Readdata_mod
+
+! { dg-final { cleanup-modules "Readdata_mod" } }