From: Tobias Burnus <burnus@net-b.de>
Date: Wed, 24 Aug 2011 13:11:08 +0000 (+0200)
Subject: re PR fortran/50163 (ICE: initialization expression)
X-Git-Tag: releases/gcc-4.7.0~4288
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=40885767dcb0f8225450ab93d001fdf800cf4205;p=thirdparty%2Fgcc.git

re PR fortran/50163 (ICE: initialization expression)

2011-08-24  Tobias Burnus  <burnus@net-b.de>

        PR fortran/50163
        * expr.c (check_init_expr): Return when an error
        occured.

2011-08-24  Tobias Burnus  <burnus@net-b.de>

        PR fortran/50163
        * gfortran.dg/initialization_28.f90: New.

From-SVN: r178038
---

diff --git a/gcc/fortran/ChangeLog b/gcc/fortran/ChangeLog
index 7e8d1af01027..ed4dc77f020a 100644
--- a/gcc/fortran/ChangeLog
+++ b/gcc/fortran/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-24  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/50163
+	* expr.c (check_init_expr): Return when an error occured.
+
 2011-08-24  Joseph Myers  <joseph@codesourcery.com>
 
 	* Make-lang.in (fortran/cpp.o): Remove explicit compilation rule.
diff --git a/gcc/fortran/expr.c b/gcc/fortran/expr.c
index 9922094fd6e2..b050b116ca5d 100644
--- a/gcc/fortran/expr.c
+++ b/gcc/fortran/expr.c
@@ -2481,6 +2481,9 @@ check_init_expr (gfc_expr *e)
 	    m = MATCH_ERROR;
 	  }
 
+	if (m == MATCH_ERROR)
+	  return FAILURE;
+
 	/* Try to scalarize an elemental intrinsic function that has an
 	   array argument.  */
 	isym = gfc_find_function (e->symtree->n.sym->name);
diff --git a/gcc/testsuite/ChangeLog b/gcc/testsuite/ChangeLog
index 96641172a4bb..d140a438ed6d 100644
--- a/gcc/testsuite/ChangeLog
+++ b/gcc/testsuite/ChangeLog
@@ -1,3 +1,8 @@
+2011-08-24  Tobias Burnus  <burnus@net-b.de>
+
+	PR fortran/50163
+	* gfortran.dg/initialization_28.f90: New.
+
 2011-08-24  Richard Guenther  <rguenther@suse.de>
 
 	PR tree-optimization/50067
diff --git a/gcc/testsuite/gfortran.dg/initialization_28.f90 b/gcc/testsuite/gfortran.dg/initialization_28.f90
new file mode 100644
index 000000000000..f5330534a532
--- /dev/null
+++ b/gcc/testsuite/gfortran.dg/initialization_28.f90
@@ -0,0 +1,9 @@
+! { dg-do compile }
+!
+! PR fortran/50163
+!
+! Contributed by Philip Mason
+!
+character(len=2) :: xx ='aa'
+integer :: iloc=index(xx,'bb') ! { dg-error "has not been declared or is a variable" }
+end